chore(rust): clean up kms module (#1752)

Author: ajewellamz

AwsCryptographicMaterialProviders/runtimes/rust/src/kms.rs

@@ -28,8 +28,7 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
             )),
         };
 
-        let shared_config = Self::AddUserAgentStringToConfig(&shared_config);
-        shared_config
+        Self::AddUserAgentStringToConfig(&shared_config)
     }
 
     #[allow(non_snake_case)]
@@ -45,7 +44,7 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
             .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,
@@ -55,8 +54,8 @@ 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 = &Self::CreateSdkConfig();
-        let inner = aws_sdk_kms::Client::new(&shared_config);
-        let client = crate::deps::com_amazonaws_kms::client::Client { inner };
+        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,
@@ -65,7 +64,7 @@ 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 = "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 
@@ -76,19 +75,18 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
         // 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());
+            .unwrap_or_default();
         let new_app_name =  if current_app_name.is_empty() {
-            format!("{}", replaced_user_agent_string)
+            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");
-        let sdkConfig = sdkConfig
+        sdkConfig
             .to_builder()
             .app_name(app_name)
-            .build();
-        sdkConfig
+            .build()
     }
     #[allow(non_snake_case)]
     pub fn RegionMatch(
@@ -101,7 +99,7 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
             );
         let any = dafny_runtime::cast_any_object!(kmsClient);
         let client =
-            dafny_runtime::cast_object!(any, crate::deps::com_amazonaws_kms::client::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,

AwsCryptographicMaterialProviders/runtimes/rust/src/lib.rs

@@ -74,3 +74,4 @@ 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;

ComAmazonawsKms/runtimes/rust/copy_externs.sh

@@ -7,6 +7,7 @@ SRC=../../../AwsCryptographicMaterialProviders/runtimes/rust/src/
 cp $SRC/concurrent_call.rs src
 cp $SRC/dafny_libraries.rs src
 # kms is different, because of ::deps::
+cp $SRC/kms.rs src
 cp $SRC/oslang.rs src
 cp $SRC/sets.rs src
 cp $SRC/time.rs src

ComAmazonawsKms/runtimes/rust/src/kms.rs

@@ -24,7 +24,7 @@ pub(crate) mod time;
 pub(crate) mod uuid;
 pub(crate) use crate::implementation_from_dafny::UTF8;
 pub(crate) mod concurrent_call;
-//pub(crate) mod dafny_libraries;
+pub(crate) use crate::client::Client as KmsClient;
 
 pub(crate) use crate::implementation_from_dafny::DafnyLibraries;
 pub(crate) use crate::implementation_from_dafny::ConcurrentCall;

ComAmazonawsKms/runtimes/rust/src/lib.rs

@@ -76,6 +76,7 @@ pub(crate) use crate::implementation_from_dafny::UUID;
 pub(crate) use crate::implementation_from_dafny::_StormTracker_Compile;
 pub(crate) use crate::implementation_from_dafny::_LocalCMC_Compile;
 pub(crate) use crate::implementation_from_dafny::_TestWrappedMaterialProvidersMain_Compile;
+pub(crate) use crate::deps::com_amazonaws_kms::client::Client as KmsClient;
 
 fn main2() {
     let args: Vec<String> = std::env::args().collect();