@temporalio/core-bridge 1.7.1 → 1.7.3

package/sdk-core/test-utils/src/lib.rs

@@ -22,7 +22,8 @@ use std::{
     time::Duration,
 };
 use temporal_client::{
-    Client, RetryClient, WorkflowClientTrait, WorkflowExecutionInfo, WorkflowOptions,
+    Client, ClientTlsConfig, RetryClient, TlsConfig, WorkflowClientTrait, WorkflowExecutionInfo,
+    WorkflowOptions,
 };
 use temporal_sdk::{
     interceptors::{FailOnNondeterminismInterceptor, WorkerInterceptor},
@@ -34,8 +35,8 @@ use temporal_sdk_core::{
     replay::HistoryForReplay,
     ClientOptions, ClientOptionsBuilder, CoreRuntime, WorkerConfig, WorkerConfigBuilder,
 };
-use temporal_sdk_core_api::errors::{PollActivityError, PollWfError};
 use temporal_sdk_core_api::{
+    errors::{PollActivityError, PollWfError},
     telemetry::{
         Logger, MetricsExporter, OtelCollectorOptions, TelemetryOptions, TelemetryOptionsBuilder,
         TraceExportConfig, TraceExporter,
@@ -60,6 +61,7 @@ pub const NAMESPACE: &str = "default";
 pub const TEST_Q: &str = "q";
 /// The env var used to specify where the integ tests should point
 pub const INTEG_SERVER_TARGET_ENV_VAR: &str = "TEMPORAL_SERVICE_ADDRESS";
+pub const INTEG_USE_TLS_ENV_VAR: &str = "TEMPORAL_USE_TLS";
 /// This env var is set (to any value) if temporal CLI dev server is in use
 pub const INTEG_TEMPORAL_DEV_SERVER_USED_ENV_VAR: &str = "INTEG_TEMPORAL_DEV_SERVER_ON";
 /// This env var is set (to any value) if the test server is in use
@@ -533,13 +535,33 @@ pub fn get_integ_server_options() -> ClientOptions {
         Err(_) => "http://localhost:7233".to_owned(),
     };
     let url = Url::try_from(&*temporal_server_address).unwrap();
-    ClientOptionsBuilder::default()
-        .identity("integ_tester".to_string())
+    let mut cb = ClientOptionsBuilder::default();
+    cb.identity("integ_tester".to_string())
         .target_url(url)
         .client_name("temporal-core".to_string())
-        .client_version("0.1.0".to_string())
-        .build()
-        .unwrap()
+        .client_version("0.1.0".to_string());
+    if let Some(tls) = get_integ_tls_config() {
+        cb.tls_cfg(tls);
+    };
+    cb.build().unwrap()
+}
+
+pub fn get_integ_tls_config() -> Option<TlsConfig> {
+    if env::var(INTEG_USE_TLS_ENV_VAR).is_ok() {
+        let root = std::fs::read("../.cloud_certs/ca.pem").unwrap();
+        let client_cert = std::fs::read("../.cloud_certs/client.pem").unwrap();
+        let client_private_key = std::fs::read("../.cloud_certs/client.key").unwrap();
+        Some(TlsConfig {
+            server_root_ca_cert: Some(root),
+            domain: None,
+            client_tls_config: Some(ClientTlsConfig {
+                client_cert,
+                client_private_key,
+            }),
+        })
+    } else {
+        None
+    }
 }
 
 pub fn get_integ_telem_options() -> TelemetryOptions {

package/sdk-core/tests/integ_tests/activity_functions.rs

@@ -0,0 +1,5 @@
+use temporal_sdk::ActContext;
+
+pub async fn echo(_ctx: ActContext, e: String) -> anyhow::Result<String> {
+    Ok(e)
+}

package/sdk-core/tests/integ_tests/workflow_tests/activities.rs

@@ -1,3 +1,4 @@
+use crate::integ_tests::activity_functions::echo;
 use anyhow::anyhow;
 use assert_matches::assert_matches;
 use futures_util::future::join_all;
@@ -52,10 +53,7 @@ async fn one_activity() {
     let mut worker = starter.worker().await;
     let client = starter.get_client().await;
     worker.register_wf(wf_name.to_owned(), one_activity_wf);
-    worker.register_activity(
-        "echo_activity",
-        |_ctx: ActContext, echo_me: String| async move { Ok(echo_me) },
-    );
+    worker.register_activity("echo_activity", echo);
 
     let run_id = worker
         .submit_wf(

package/sdk-core/tests/integ_tests/workflow_tests/determinism.rs

@@ -2,7 +2,6 @@ use std::{
     sync::atomic::{AtomicUsize, Ordering},
     time::Duration,
 };
-
 use temporal_sdk::{ActivityOptions, WfContext, WorkflowResult};
 use temporal_sdk_core_test_utils::CoreWfStarter;
 

package/sdk-core/tests/integ_tests/workflow_tests/local_activities.rs

@@ -1,3 +1,4 @@
+use crate::integ_tests::activity_functions::echo;
 use anyhow::anyhow;
 use futures::future::join_all;
 use std::{
@@ -12,9 +13,10 @@ use temporal_sdk::{
 use temporal_sdk_core::replay::HistoryForReplay;
 use temporal_sdk_core_protos::{
     coresdk::{
-        workflow_commands::workflow_command::Variant, workflow_commands::ActivityCancellationType,
-        workflow_completion, workflow_completion::workflow_activation_completion,
-        workflow_completion::WorkflowActivationCompletion, AsJsonPayloadExt,
+        workflow_commands::{workflow_command::Variant, ActivityCancellationType},
+        workflow_completion,
+        workflow_completion::{workflow_activation_completion, WorkflowActivationCompletion},
+        AsJsonPayloadExt,
     },
     temporal::api::{common::v1::RetryPolicy, enums::v1::TimeoutType},
     TestHistoryBuilder,
@@ -25,10 +27,6 @@ use temporal_sdk_core_test_utils::{
 };
 use tokio_util::sync::CancellationToken;
 
-pub async fn echo(_ctx: ActContext, e: String) -> anyhow::Result<String> {
-    Ok(e)
-}
-
 pub async fn one_local_activity_wf(ctx: WfContext) -> WorkflowResult<()> {
     let initial_workflow_time = ctx.workflow_time().expect("Workflow time should be set");
     ctx.local_activity(LocalActivityOptions {

package/sdk-core/tests/integ_tests/workflow_tests.rs

@@ -15,6 +15,7 @@ mod stickyness;
 mod timers;
 mod upsert_search_attrs;
 
+use crate::integ_tests::activity_functions::echo;
 use assert_matches::assert_matches;
 use futures::{channel::mpsc::UnboundedReceiver, future, SinkExt, StreamExt};
 use std::{
@@ -26,9 +27,7 @@ use std::{
     time::Duration,
 };
 use temporal_client::{WorkflowClientTrait, WorkflowOptions};
-use temporal_sdk::{
-    interceptors::WorkerInterceptor, ActContext, ActivityOptions, WfContext, WorkflowResult,
-};
+use temporal_sdk::{interceptors::WorkerInterceptor, ActivityOptions, WfContext, WorkflowResult};
 use temporal_sdk_core::replay::HistoryForReplay;
 use temporal_sdk_core_api::{errors::PollWfError, Worker};
 use temporal_sdk_core_protos::{
@@ -564,10 +563,7 @@ async fn slow_completes_with_small_cache() {
         }
         Ok(().into())
     });
-    worker.register_activity(
-        "echo_activity",
-        |_ctx: ActContext, echo_me: String| async move { Ok(echo_me) },
-    );
+    worker.register_activity("echo_activity", echo);
     for i in 0..20 {
         worker
             .submit_wf(

package/sdk-core/tests/main.rs

@@ -7,6 +7,7 @@ extern crate temporal_sdk_core_test_utils;
 
 #[cfg(test)]
 mod integ_tests {
+    mod activity_functions;
     mod client_tests;
     mod ephemeral_server_tests;
     mod heartbeat_tests;