Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions crates/sdk-axum/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
use axum::{
Extension, Json,
extract::{Path, State},
http::StatusCode,
};
use dataplane_sdk::{
core::{
db::tx::TransactionalContext,
model::{
data_flow::DataFlowState,
messages::{
DataFlowPrepareMessage, DataFlowResumeMessage, DataFlowStartMessage,
DataFlowStartedNotificationMessage, DataFlowStatusMessage,
Expand Down Expand Up @@ -48,12 +50,18 @@ pub async fn prepare_flow<C>(
State(sdk): State<DataPlaneSdk<C>>,
Extension(participant): Extension<ParticipantContext>,
Json(msg): Json<DataFlowPrepareMessage>,
) -> SignalingResult<Json<DataFlowStatusMessage>>
) -> SignalingResult<(StatusCode, Json<DataFlowStatusMessage>)>
where
C: TransactionalContext,
{
let response = sdk.prepare(&participant.id, msg).await?;
Ok(Json(response))

let status = match response.state {
DataFlowState::Preparing => StatusCode::OK,
_ => StatusCode::OK,
};

Ok((status, Json(response)))
}

#[derive(Deserialize)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE TYPE data_flow_state AS ENUM ('started','suspended','terminated','completed', 'initiating', 'initiated', 'preparing', 'prepared');
CREATE TYPE data_flow_state AS ENUM ('starting','started','suspended','terminated','completed', 'initiating', 'initiated', 'preparing', 'prepared');
CREATE TYPE data_flow_type AS ENUM ('consumer','provider');


Expand Down
1 change: 1 addition & 0 deletions crates/sdk-tck-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ axum.workspace=true
tower-http = { version = "0.6.9", features = ["trace"]}
futures.workspace=true
regex.workspace=true
bon.workspace=true

[lints]
workspace = true
14 changes: 12 additions & 2 deletions crates/sdk-tck-tests/tests/dps.tck.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,34 @@ DP_P_PULL_01_01_TRANSFERTYPE=http_pull_sync
DP_P_PULL_01_02_TRANSFERTYPE=http_pull_sync
DP_P_PULL_02_01_TRANSFERTYPE=http_pull_sync
DP_P_PULL_02_02_TRANSFERTYPE=http_pull_sync

DP_P_PULL_04_01_TRANSFERTYPE=http_pull_async
DP_P_PULL_04_01_AGREEMENTID=initiating-started

# pull consumer side
DP_C_PULL_01_01_TRANSFERTYPE=http_pull_sync
DP_C_PULL_01_02_TRANSFERTYPE=http_pull_sync
DP_C_PULL_02_01_TRANSFERTYPE=http_pull_sync
DP_C_PULL_02_02_TRANSFERTYPE=http_pull_sync
DP_C_PULL_03_01_TRANSFERTYPE=http_pull_sync
DP_C_PULL_03_01_AGREEMENTID=prepared-completed
DP_C_PULL_04_01_TRANSFERTYPE=http_pull_async
DP_C_PULL_04_01_AGREEMENTID=initiating-prepared

# push consumer side
DP_C_PUSH_01_01_TRANSFERTYPE=http_push_sync
DP_C_PUSH_01_02_TRANSFERTYPE=http_push_sync
DP_C_PUSH_02_01_TRANSFERTYPE=http_push_sync
DP_C_PUSH_02_02_TRANSFERTYPE=http_push_sync
DP_C_PUSH_03_01_TRANSFERTYPE=http_push_sync
DP_C_PUSH_04_01_TRANSFERTYPE=http_push_async
DP_C_PUSH_04_01_AGREEMENTID=initiating-prepared

# push provider side
DP_P_PUSH_01_01_TRANSFERTYPE=http_push_sync
DP_P_PUSH_01_02_TRANSFERTYPE=http_push_sync
DP_P_PUSH_02_01_TRANSFERTYPE=http_push_sync
DP_P_PUSH_02_02_TRANSFERTYPE=http_push_sync

DP_P_PUSH_03_01_TRANSFERTYPE=http_push_sync
DP_P_PUSH_03_01_AGREEMENTID=initiating-completed
DP_P_PUSH_04_01_TRANSFERTYPE=http_push_async
DP_P_PUSH_04_01_AGREEMENTID=initiating-started
Loading