chore(rust): release 1.2.1

ajewellamz · ajewellamz · commit 6ac0f84c478b · 2025-11-19T14:47:01.000-05:00
diff --git a/AwsEncryptionSDK/runtimes/rust/Cargo.toml b/AwsEncryptionSDK/runtimes/rust/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "aws-esdk"
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
-rust-version = "1.86.0"
+rust-version = "1.88.0"
 keywords = ["cryptography", "security", "dynamodb", "encryption", "client-side"]
 license = "ISC AND (Apache-2.0 OR ISC)"
 description = "aws-esdk is a library for implementing client side encryption."
@@ -16,22 +16,22 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = "1.8.5"
-aws-lc-rs = {version = "1.13.3"}
-aws-lc-sys = { version = "0.30", optional = true }
+aws-config = "1.8.10"
+aws-lc-rs = {version = "1.15.0"}
+aws-lc-sys = { version = "0.33", optional = true }
 aws-lc-fips-sys = { version = "0.13", optional = true }
-aws-sdk-dynamodb = "1.90.0"
-aws-sdk-kms = "1.84.0"
-aws-smithy-runtime-api = {version = "1.9.0", features = ["client"] }
-aws-smithy-types = "1.3.2"
-chrono = "0.4.41"
+aws-sdk-dynamodb = "1.98.0"
+aws-sdk-kms = "1.94.0"
+aws-smithy-runtime-api = {version = "1.9.2", features = ["client"] }
+aws-smithy-types = "1.3.4"
+chrono = "0.4.42"
 cpu-time = "1.0.0"
 dafny_runtime = { path = "../../../mpl/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust", features = ["sync","small-int"]}
 dashmap = "6.1.0"
-pem = "3.0.5"
+pem = "3.0.6"
 rand = "0.9.2"
-tokio = {version = "1.47.1", features = ["full"] }
-uuid = { version = "1.18.0", features = ["v4"] }
+tokio = {version = "1.48.0", features = ["full"] }
+uuid = { version = "1.18.1", features = ["v4"] }
 
 [[example]]
 name = "main"
diff --git a/AwsEncryptionSDK/runtimes/rust/src/lib.rs b/AwsEncryptionSDK/runtimes/rust/src/lib.rs
@@ -111,6 +111,7 @@ pub(crate) use crate::implementation_from_dafny::ECDH;
 pub(crate) use crate::implementation_from_dafny::HMAC;
 pub(crate) use crate::implementation_from_dafny::UTF8;
 pub(crate) use crate::implementation_from_dafny::UUID;
+pub(crate) use crate::deps::com_amazonaws_kms::client::Client as KmsClient;
 
 // Import smithy-generated modules
 pub(crate) mod conversions;
diff --git a/mpl b/mpl
@@ -1 +1 @@
-Subproject commit 1ac31b6ed320cff83cb9374230d4613651423e2a
+Subproject commit 687837704534fccf7764767b7057a7b83a3f1a17
diff --git a/releases/rust/esdk/Cargo.toml b/releases/rust/esdk/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "aws-esdk"
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
-rust-version = "1.86.0"
+rust-version = "1.88.0"
 keywords = ["cryptography", "security", "dynamodb", "encryption", "client-side"]
 license = "ISC AND (Apache-2.0 OR ISC)"
 description = "aws-esdk is a library for implementing client side encryption."
@@ -16,21 +16,21 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = "1.8.5"
-aws-lc-rs = {version = "1.13.3"}
-aws-lc-sys = { version = "0.30", optional = true }
+aws-config = "1.8.10"
+aws-lc-rs = {version = "1.15.0"}
+aws-lc-sys = { version = "0.33", optional = true }
 aws-lc-fips-sys = { version = "0.13", optional = true }
-aws-sdk-dynamodb = "1.90.0"
-aws-sdk-kms = "1.84.0"
-aws-smithy-runtime-api = {version = "1.9.0", features = ["client"] }
-aws-smithy-types = "1.3.2"
-chrono = "0.4.41"
+aws-sdk-dynamodb = "1.98.0"
+aws-sdk-kms = "1.94.0"
+aws-smithy-runtime-api = {version = "1.9.2", features = ["client"] }
+aws-smithy-types = "1.3.4"
+chrono = "0.4.42"
 cpu-time = "1.0.0"
 dashmap = "6.1.0"
-pem = "3.0.5"
+pem = "3.0.6"
 rand = "0.9.2"
-tokio = {version = "1.47.1", features = ["full"] }
-uuid = { version = "1.18.0", features = ["v4"] }
+tokio = {version = "1.48.0", features = ["full"] }
+uuid = { version = "1.18.1", features = ["v4"] }
 dafny-runtime = { version = "0.3.1", features = ["sync", "small-int"] }
 
 [[example]]
diff --git a/releases/rust/esdk/src/concurrent_call.rs b/releases/rust/esdk/src/concurrent_call.rs
@@ -10,23 +10,23 @@
 pub mod ConcurrentCall {
 
     fn de_const(
-        p: *const dafny_runtime::Object<(dyn Callee + 'static)>,
-    ) -> *mut dafny_runtime::Object<(dyn Callee + 'static)> {
+        p: *const dafny_runtime::Object<dyn Callee + 'static>,
+    ) -> *mut dafny_runtime::Object<dyn Callee + 'static> {
         p as _
     }
 
     pub struct FakeCallee {
-        callee: *const dafny_runtime::Object<(dyn Callee + 'static)>,
+        callee: *const dafny_runtime::Object<dyn Callee + 'static>,
     }
     impl FakeCallee {
-        fn new(callee: &dafny_runtime::Object<(dyn Callee + 'static)>) -> Self {
+        fn new(callee: &dafny_runtime::Object<dyn Callee + 'static>) -> Self {
             Self {
                 callee: std::ptr::from_ref(callee),
             }
         }
         fn call(&self, x: u32, y: u32) {
             let mptr = de_const(self.callee);
-            let value: &mut dafny_runtime::Object<(dyn Callee + 'static)> = unsafe { &mut *mptr };
+            let value: &mut dafny_runtime::Object<dyn Callee + 'static> = unsafe { &mut *mptr };
             value.as_mut().call(x, y);
         }
     }
@@ -37,7 +37,7 @@ pub mod ConcurrentCall {
     use crate::ConcurrentCall::Callee;
     impl _default {
         pub fn ConcurrentCall(
-            callee: &dafny_runtime::Object<(dyn Callee + 'static)>,
+            callee: &dafny_runtime::Object<dyn Callee + 'static>,
             serial_iters: u32,
             concurrent_iters: u32,
         ) {
diff --git a/releases/rust/esdk/src/ecdh.rs b/releases/rust/esdk/src/ecdh.rs
@@ -442,7 +442,7 @@ pub mod ECDH {
                 &public_key,
             );
             let shared: Vec<u8> =
-                aws_lc_rs::agreement::agree(&private_key, &public_key, "foo", |x| Ok(x.to_vec()))
+                aws_lc_rs::agreement::agree(&private_key, public_key, "foo", |x| Ok(x.to_vec()))
                     .map_err(|_e| "Failure in aws_lc_rs::agreement::agree.".to_string())?;
             Ok(shared)
         }
diff --git a/releases/rust/esdk/src/kms.rs b/releases/rust/esdk/src/kms.rs
@@ -5,9 +5,8 @@
 #![deny(nonstandard_style)]
 #![deny(clippy::all)]
 
-use aws_config::Region;
+use aws_config::{AppName, Region, SdkConfig};
 use std::sync::LazyLock;
-
 static DAFNY_TOKIO_RUNTIME: LazyLock<tokio::runtime::Runtime> = LazyLock::new(|| {
     tokio::runtime::Builder::new_multi_thread()
         .enable_all()
@@ -17,12 +16,7 @@ static DAFNY_TOKIO_RUNTIME: LazyLock<tokio::runtime::Runtime> = LazyLock::new(||
 
 impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_default {
     #[allow(non_snake_case)]
-    pub fn KMSClientForRegion(region: &::dafny_runtime::Sequence<::dafny_runtime::DafnyCharUTF16>) -> ::dafny_runtime::Rc<crate::r#_Wrappers_Compile::Result<::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>, ::dafny_runtime::Rc<crate::software::amazon::cryptography::services::kms::internaldafny::types::Error>>>{
-        let region =
-            dafny_runtime::dafny_runtime_conversions::unicode_chars_false::dafny_string_to_string(
-                region,
-            );
-
+    fn CreateSdkConfig() -> SdkConfig {
         let shared_config = match tokio::runtime::Handle::try_current() {
             Ok(curr) => tokio::task::block_in_place(|| {
                 curr.block_on(async {
@@ -34,12 +28,23 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
             )),
         };
 
+        Self::AddUserAgentStringToConfig(&shared_config)
+    }
+
+    #[allow(non_snake_case)]
+    pub fn KMSClientForRegion(region: &::dafny_runtime::Sequence<::dafny_runtime::DafnyCharUTF16>) -> ::dafny_runtime::Rc<crate::r#_Wrappers_Compile::Result<::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>, ::dafny_runtime::Rc<crate::software::amazon::cryptography::services::kms::internaldafny::types::Error>>>{
+        let region =
+            dafny_runtime::dafny_runtime_conversions::unicode_chars_false::dafny_string_to_string(
+                region,
+            );
+
+        let shared_config = &Self::CreateSdkConfig();
         let shared_config = shared_config
             .to_builder()
             .region(Region::new(region))
             .build();
         let inner = aws_sdk_kms::Client::new(&shared_config);
-        let client = crate::deps::com_amazonaws_kms::client::Client { inner };
+        let client = crate::KmsClient { inner };
         let dafny_client = ::dafny_runtime::upcast_object()(::dafny_runtime::object::new(client));
         dafny_runtime::Rc::new(crate::r#_Wrappers_Compile::Result::Success {
             value: dafny_client,
@@ -48,25 +53,41 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
 
     #[allow(non_snake_case)]
     pub fn KMSClient() -> ::dafny_runtime::Rc<crate::r#_Wrappers_Compile::Result<::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>, ::dafny_runtime::Rc<crate::software::amazon::cryptography::services::kms::internaldafny::types::Error>>>{
-        let shared_config = match tokio::runtime::Handle::try_current() {
-            Ok(curr) => tokio::task::block_in_place(|| {
-                curr.block_on(async {
-                    aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
-                })
-            }),
-            Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
-                aws_config::BehaviorVersion::latest(),
-            )),
-        };
-
-        let inner = aws_sdk_kms::Client::new(&shared_config);
-        let client = crate::deps::com_amazonaws_kms::client::Client { inner };
+        let shared_config = &Self::CreateSdkConfig();
+        let inner = aws_sdk_kms::Client::new(shared_config);
+        let client = crate::KmsClient { inner };
         let dafny_client = ::dafny_runtime::upcast_object()(::dafny_runtime::object::new(client));
         dafny_runtime::Rc::new(crate::r#_Wrappers_Compile::Result::Success {
             value: dafny_client,
         })
     }
 
+    #[allow(non_snake_case)]
+    fn AddUserAgentStringToConfig(sdkConfig: &SdkConfig) -> SdkConfig {
+        let runtime = "Rust".to_string();
+        let runtime_msg =
+            dafny_runtime::dafny_runtime_conversions::unicode_chars_false::string_to_dafny_string(
+                &runtime,
+            );
+        // sadly rust doesn't allow for '/' in the app name which the dafny function adds
+        // so we will replace '/' with '-' which is allowed
+        let user_agent_string = dafny_runtime::dafny_runtime_conversions::unicode_chars_false::dafny_string_to_string(
+            &crate::software::amazon::cryptography::services::kms::internaldafny::_default::DafnyUserAgentSuffix(&runtime_msg)
+        );
+        let replaced_user_agent_string = user_agent_string.replace("/", "-");
+        // To update the user agent string we take the application name and update it.
+        let current_app_name = sdkConfig
+            .app_name()
+            .map(|app_name| app_name.to_string())
+            .unwrap_or_default();
+        let new_app_name = if current_app_name.is_empty() {
+            replaced_user_agent_string.to_string()
+        } else {
+            format!("{} {} ", current_app_name, replaced_user_agent_string)
+        };
+        let app_name = AppName::new(new_app_name).expect("Valid app name");
+        sdkConfig.to_builder().app_name(app_name).build()
+    }
     #[allow(non_snake_case)]
     pub fn RegionMatch(
         kmsClient: &::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>,
@@ -77,8 +98,7 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
                 region,
             );
         let any = dafny_runtime::cast_any_object!(kmsClient);
-        let client =
-            dafny_runtime::cast_object!(any, crate::deps::com_amazonaws_kms::client::Client);
+        let client = dafny_runtime::cast_object!(any, crate::KmsClient);
         let flag = match client.as_ref().inner.config().region() {
             Some(r) => r.as_ref() == region,
             None => false,
diff --git a/releases/rust/esdk/src/lib.rs b/releases/rust/esdk/src/lib.rs
@@ -96,6 +96,7 @@ mod standard_library_conversions;
 mod standard_library_externs;
 
 pub(crate) mod implementation_from_dafny;
+pub(crate) use crate::deps::com_amazonaws_kms::client::Client as KmsClient;
 pub(crate) use crate::implementation_from_dafny::r#_Wrappers_Compile;
 pub(crate) use crate::implementation_from_dafny::software;
 pub(crate) use crate::implementation_from_dafny::AesKdfCtr;

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ pub mod ECDH {`
`442`	`442`	`&public_key,`
`443`	`443`	`);`
`444`	`444`	`let shared: Vec<u8> =`
`445`		`- aws_lc_rs::agreement::agree(&private_key, &public_key, "foo", \|x\| Ok(x.to_vec()))`
	`445`	`+ aws_lc_rs::agreement::agree(&private_key, public_key, "foo", \|x\| Ok(x.to_vec()))`
`446`	`446`	`.map_err(\|_e\| "Failure in aws_lc_rs::agreement::agree.".to_string())?;`
`447`	`447`	`Ok(shared)`
`448`	`448`	`}`