chore: update kms externs correctly (#1717)

Author: josecorella

AwsCryptographicMaterialProviders/runtimes/rust/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,6 +28,18 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
             )),
         };
 
+        let shared_config = Self::AddUserAgentStringToConfig(&shared_config);
+        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))
@@ -48,17 +54,7 @@ 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 shared_config = &Self::CreateSdkConfig();
         let inner = aws_sdk_kms::Client::new(&shared_config);
         let client = crate::deps::com_amazonaws_kms::client::Client { inner };
         let dafny_client = ::dafny_runtime::upcast_object()(::dafny_runtime::object::new(client));
@@ -67,6 +63,33 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
         })
     }
 
+    #[allow(non_snake_case)]
+    fn AddUserAgentStringToConfig(sdkConfig: &SdkConfig) -> SdkConfig {
+        let runtime = format!("Rust");
+        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_else(|| "".to_string());
+        let new_app_name =  if current_app_name.is_empty() {
+            format!("{}", replaced_user_agent_string)
+        } else { 
+            format!("{} {} ", current_app_name, replaced_user_agent_string)
+        };
+        let app_name = AppName::new(new_app_name)
+            .expect("Valid app name");
+        let sdkConfig = sdkConfig
+            .to_builder()
+            .app_name(app_name)
+            .build();
+        sdkConfig
+    }
     #[allow(non_snake_case)]
     pub fn RegionMatch(
         kmsClient: &::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>,

ComAmazonawsKms/runtimes/rust/src/kms.rs

@@ -31,6 +31,7 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
         let shared_config = Self::AddUserAgentStringToConfig(&shared_config);
         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 =
@@ -99,8 +100,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::client::Client);
+        let client = dafny_runtime::cast_object!(any, crate::client::Client);
         let flag = match client.as_ref().inner.config().region() {
             Some(r) => r.as_ref() == region,
             None => false,