Skip to content

Commit 3ef3c8d

Browse files
jmaeagle99jmaeagle99
committed
Adjust to proto changes
1 parent 1159737 commit 3ef3c8d

12 files changed

Lines changed: 40 additions & 4 deletions

File tree

‎crates/common/build.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ const SERDE_DERIVE_PREFIXES: &[&str] = &[
3030
".grpc",
3131
".temporal.api.activity",
3232
".temporal.api.batch",
33+
".temporal.api.callback",
3334
".temporal.api.cloud",
3435
".temporal.api.command",
36+
".temporal.api.compute",
3537
".temporal.api.deployment",
3638
".temporal.api.filter",
3739
".temporal.api.history",

‎crates/common/src/protos/history_builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ impl TestHistoryBuilder {
377377
stack_trace: "".to_string(),
378378
cause: None,
379379
failure_info: Some(failure::FailureInfo::CanceledFailureInfo(
380-
CanceledFailureInfo { details: None },
380+
CanceledFailureInfo { details: None, identity: Default::default() },
381381
)),
382382
encoded_attributes: Default::default(),
383383
}),

‎crates/common/src/protos/mod.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ pub mod coresdk {
315315
failure_info: Some(failure::FailureInfo::CanceledFailureInfo(
316316
CanceledFailureInfo {
317317
details: details.map(Into::into),
318+
identity: Default::default(),
318319
},
319320
)),
320321
..Default::default()
@@ -1654,6 +1655,11 @@ pub mod temporal {
16541655
tonic::include_proto!("temporal.api.batch.v1");
16551656
}
16561657
}
1658+
pub mod callback {
1659+
pub mod v1 {
1660+
tonic::include_proto!("temporal.api.callback.v1");
1661+
}
1662+
}
16571663
pub mod command {
16581664
pub mod v1 {
16591665
tonic::include_proto!("temporal.api.command.v1");
@@ -2180,6 +2186,11 @@ pub mod temporal {
21802186
}
21812187
}
21822188
}
2189+
pub mod compute {
2190+
pub mod v1 {
2191+
tonic::include_proto!("temporal.api.compute.v1");
2192+
}
2193+
}
21832194
pub mod deployment {
21842195
pub mod v1 {
21852196
tonic::include_proto!("temporal.api.deployment.v1");
@@ -2414,6 +2425,8 @@ pub mod temporal {
24142425
Attributes::WorkflowExecutionPausedEventAttributes(_) => true,
24152426
// !! Ignorable !!
24162427
Attributes::WorkflowExecutionUnpausedEventAttributes(_) => true,
2428+
// !! Ignorable !!
2429+
Attributes::WorkflowExecutionTimeSkippingTransitionedEventAttributes(_) => true,
24172430
}
24182431
} else {
24192432
false
@@ -2495,6 +2508,7 @@ pub mod temporal {
24952508
Attributes::NexusOperationCancelRequestFailedEventAttributes(_) => { EventType::NexusOperationCancelRequestFailed }
24962509
Attributes::WorkflowExecutionPausedEventAttributes(_) => { EventType::WorkflowExecutionPaused }
24972510
Attributes::WorkflowExecutionUnpausedEventAttributes(_) => { EventType::WorkflowExecutionUnpaused }
2511+
Attributes::WorkflowExecutionTimeSkippingTransitionedEventAttributes(_) => { EventType::WorkflowExecutionTimeSkippingTransitioned }
24982512
}
24992513
}
25002514
}

‎crates/sdk-core/src/core_tests/workers.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@ fn create_test_nexus_task(
436436
)),
437437
}),
438438
poller_scaling_decision: None,
439+
poller_group_id: Default::default(),
440+
poller_group_infos: vec![],
439441
}
440442
}
441443

@@ -1068,6 +1070,7 @@ async fn nexus_start_operation_failure_with_canceled_failure_info() {
10681070
message: "operation canceled".to_string(),
10691071
failure_info: Some(FailureInfo::CanceledFailureInfo(CanceledFailureInfo {
10701072
details: None,
1073+
identity: Default::default(),
10711074
})),
10721075
..Default::default()
10731076
},
@@ -1147,6 +1150,7 @@ async fn nexus_start_operation_failure_with_invalid_failure_info(
11471150
#[case::canceled_failure(
11481151
FailureInfo::CanceledFailureInfo(CanceledFailureInfo {
11491152
details: None,
1153+
identity: Default::default(),
11501154
}),
11511155
NexusOperationErrorState::Canceled
11521156
)]

‎crates/sdk-core/src/worker/activities.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ impl WorkerActivityTasks {
392392
let details = if let Some(Failure {
393393
failure_info:
394394
Some(FailureInfo::CanceledFailureInfo(CanceledFailureInfo {
395-
details,
395+
details, ..
396396
})),
397397
..
398398
}) = failure

‎crates/sdk-core/src/worker/client.rs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ impl WorkerClient for WorkerClientBag {
310310
worker_version_capabilities: self.worker_version_capabilities(),
311311
deployment_options: self.deployment_options(),
312312
worker_instance_key: self.worker_instance_key.to_string(),
313+
poller_group_id: Default::default(),
314+
worker_control_task_queue: Default::default(),
313315
}
314316
.into_request();
315317
request.extensions_mut().insert(IsWorkerTaskLongPoll);
@@ -348,6 +350,8 @@ impl WorkerClient for WorkerClientBag {
348350
worker_version_capabilities: self.worker_version_capabilities(),
349351
deployment_options: self.deployment_options(),
350352
worker_instance_key: self.worker_instance_key.to_string(),
353+
poller_group_id: Default::default(),
354+
worker_control_task_queue: Default::default(),
351355
}
352356
.into_request();
353357
request.extensions_mut().insert(IsWorkerTaskLongPoll);
@@ -384,6 +388,7 @@ impl WorkerClient for WorkerClientBag {
384388
deployment_options: self.deployment_options(),
385389
worker_heartbeat: Vec::new(),
386390
worker_instance_key: self.worker_instance_key.to_string(),
391+
poller_group_id: Default::default(),
387392
}
388393
.into_request();
389394
request.extensions_mut().insert(IsWorkerTaskLongPoll);
@@ -445,6 +450,8 @@ impl WorkerClient for WorkerClientBag {
445450
versioning_behavior: request.versioning_behavior.into(),
446451
deployment_options: self.deployment_options(),
447452
resource_id: Default::default(),
453+
worker_instance_key: self.worker_instance_key.to_string(),
454+
worker_control_task_queue: Default::default(),
448455
};
449456
Ok(self
450457
.connection
@@ -495,6 +502,7 @@ impl WorkerClient for WorkerClientBag {
495502
identity: self.identity(),
496503
task_token: task_token.0,
497504
response: Some(response),
505+
poller_group_id: Default::default(),
498506
}
499507
.into_request(),
500508
)
@@ -630,6 +638,7 @@ impl WorkerClient for WorkerClientBag {
630638
task_token: task_token.0,
631639
failure,
632640
error,
641+
poller_group_id: Default::default(),
633642
}
634643
.into_request(),
635644
)
@@ -691,6 +700,7 @@ impl WorkerClient for WorkerClientBag {
691700
namespace: self.namespace.clone(),
692701
failure,
693702
cause: cause.into(),
703+
poller_group_id: Default::default(),
694704
}
695705
.into_request(),
696706
)

‎crates/sdk-core/src/worker/client/mocks.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub(crate) static DEFAULT_TEST_CAPABILITIES: &Capabilities = &Capabilities {
1818
sdk_metadata: true,
1919
count_group_by_execution_status: false,
2020
nexus: false,
21+
server_scaled_deployments: false,
2122
};
2223

2324
#[cfg(any(feature = "test-utilities", test))]

‎crates/sdk-core/src/worker/workflow/machines/activity_state_machine.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,7 @@ fn new_cancel_failure(dat: &SharedState, attrs: ActivityTaskCanceledEventAttribu
866866
cause: Some(Box::from(Failure {
867867
failure_info: Some(FailureInfo::CanceledFailureInfo(CanceledFailureInfo {
868868
details: attrs.details,
869+
identity: Default::default(),
869870
})),
870871
..Default::default()
871872
})),

‎crates/sdk-core/src/worker/workflow/machines/cancel_external_state_machine.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ pub(super) fn new_external_cancel(
6363
let mut s = CancelExternalMachine::from_parts(Created {}.into(), SharedState { seq });
6464
OnEventWrapper::on_event_mut(&mut s, CancelExternalMachineEvents::Schedule)
6565
.expect("Scheduling cancel external wf command doesn't fail");
66+
#[allow(deprecated)]
6667
let cmd_attrs = command::Attributes::RequestCancelExternalWorkflowExecutionCommandAttributes(
6768
RequestCancelExternalWorkflowExecutionCommandAttributes {
6869
namespace: workflow_execution.namespace,

‎crates/sdk-core/src/worker/workflow/machines/child_workflow_state_machine.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ impl Started {
399399
cause: Some(Box::new(Failure {
400400
message: "Terminated".to_owned(),
401401
failure_info: Some(FailureInfo::TerminatedFailureInfo(
402-
failure::TerminatedFailureInfo {},
402+
failure::TerminatedFailureInfo { identity: Default::default() },
403403
)),
404404
..Default::default()
405405
})),
@@ -729,6 +729,7 @@ impl WFMachinesAdapter for ChildWorkflowMachine {
729729
ChildWorkflowCommand::IssueCancelAfterStarted { reason } => {
730730
let mut resps = vec![];
731731
if self.shared_state.cancel_type != ChildWorkflowCancellationType::Abandon {
732+
#[allow(deprecated)]
732733
resps.push(MachineResponse::NewCoreOriginatedCommand(
733734
RequestCancelExternalWorkflowExecutionCommandAttributes {
734735
namespace: self.shared_state.namespace.clone(),

0 commit comments

Comments
 (0)