m

Author: ajewellamz

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/client_supplier/client_supplier_example.rs

@@ -16,12 +16,12 @@
 */
 
 use super::regional_role_client_supplier::RegionalRoleClientSupplier;
-use aws_esdk::client as esdk_client;
-use aws_esdk::material_providers::client as mpl_client;
-use aws_esdk::material_providers::types::DiscoveryFilter;
-use aws_esdk::material_providers::types::error::Error::AwsCryptographicMaterialProvidersException;
-use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_esdk::types::*;
+use aws_esdk::Client as EsdkClient;
+use aws_esdk::*;
+use aws_mpl_rs::client as mpl_client;
+use aws_mpl_rs::types::DiscoveryFilter;
+use aws_mpl_rs::types::error::Error::AwsCryptographicMaterialProvidersException;
+use aws_mpl_rs::types::material_providers_config::MaterialProvidersConfig;
 
 pub async fn encrypt_and_decrypt_with_keyring(
     example_data: &str,
@@ -35,7 +35,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     // that this client will only decrypt encrypted messages that were created with a committing
     // algorithm suite.
     let esdk_config = AwsEncryptionSdkConfig::default();
-    let esdk_client = esdk_client::Client::from_conf(esdk_config)?;
+    let esdk_client = EsdkClient::from_conf(esdk_config)?;
 
     // 2. Create encryption context.
     // Remember that your encryption context is NOT SECRET.

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/client_supplier/regional_role_client_supplier.rs

@@ -3,10 +3,10 @@
 
 use super::regional_role_client_supplier_config;
 use aws_config::Region;
-use aws_esdk::material_providers::operation::get_client::GetClientInput;
-use aws_esdk::material_providers::types::ClientSupplier;
-use aws_esdk::material_providers::types::error::Error;
 use aws_mpl_rs::com_amazonaws_kms::client::Client as kms_client;
+use aws_mpl_rs::operation::get_client::GetClientInput;
+use aws_mpl_rs::types::ClientSupplier;
+use aws_mpl_rs::types::error::Error;
 
 /*
  Example class demonstrating an implementation of a custom client supplier.

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/client_supplier/regional_role_client_supplier_config.rs

@@ -1,7 +1,7 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use aws_esdk::types::EncryptionContext;
+use aws_esdk::EncryptionContext;
 
 /*
  Class containing config for the RegionalRoleClientSupplier.

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/cryptographic_materials_manager/required_encryption_context/required_encryption_context_example.rs

@@ -8,10 +8,10 @@ on encrypt such that they will not be stored on the message, but WILL be include
 On decrypt, the client MUST supply the key/value pair(s) that were not stored to successfully decrypt the message.
 */
 
-use aws_esdk::client as esdk_client;
-use aws_esdk::material_providers::client as mpl_client;
-use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_esdk::types::*;
+use aws_esdk::Client as EsdkClient;
+use aws_esdk::*;
+use aws_mpl_rs::client as mpl_client;
+use aws_mpl_rs::types::material_providers_config::MaterialProvidersConfig;
 use std::vec::Vec;
 
 pub async fn encrypt_and_decrypt_with_cmm(
@@ -24,7 +24,7 @@ pub async fn encrypt_and_decrypt_with_cmm(
     // that this client will only decrypt encrypted messages that were created with a committing
     // algorithm suite.
     let esdk_config = AwsEncryptionSdkConfig::default();
-    let esdk_client = esdk_client::Client::from_conf(esdk_config)?;
+    let esdk_client = EsdkClient::from_conf(esdk_config)?;
 
     // 2. Create a KMS client.
     let sdk_config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/cryptographic_materials_manager/restrict_algorithm_suite/signing_only_example.rs

@@ -7,12 +7,12 @@
 */
 
 use super::signing_suite_only_cmm::SigningSuiteOnlyCMM;
-use aws_esdk::client as esdk_client;
-use aws_esdk::material_providers::client as mpl_client;
-use aws_esdk::material_providers::types::EsdkAlgorithmSuiteId;
-use aws_esdk::material_providers::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
-use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_esdk::types::*;
+use aws_esdk::Client as EsdkClient;
+use aws_esdk::*;
+use aws_mpl_rs::client as mpl_client;
+use aws_mpl_rs::types::EsdkAlgorithmSuiteId;
+use aws_mpl_rs::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
+use aws_mpl_rs::types::material_providers_config::MaterialProvidersConfig;
 
 pub async fn encrypt_and_decrypt_with_cmm(
     example_data: &str,
@@ -24,7 +24,7 @@ pub async fn encrypt_and_decrypt_with_cmm(
     // that this client will only decrypt encrypted messages that were created with a committing
     // algorithm suite.
     let esdk_config = AwsEncryptionSdkConfig::default();
-    let esdk_client = esdk_client::Client::from_conf(esdk_config)?;
+    let esdk_client = EsdkClient::from_conf(esdk_config)?;
 
     // 2. Create a KMS client.
     let sdk_config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/cryptographic_materials_manager/restrict_algorithm_suite/signing_suite_only_cmm.rs

@@ -1,18 +1,18 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use aws_esdk::material_providers::client as mpl_client;
-use aws_esdk::material_providers::operation::decrypt_materials::DecryptMaterialsInput;
-use aws_esdk::material_providers::operation::decrypt_materials::DecryptMaterialsOutput;
-use aws_esdk::material_providers::operation::get_encryption_materials::GetEncryptionMaterialsInput;
-use aws_esdk::material_providers::operation::get_encryption_materials::GetEncryptionMaterialsOutput;
-use aws_esdk::material_providers::types::AlgorithmSuiteId;
-use aws_esdk::material_providers::types::EsdkAlgorithmSuiteId;
-use aws_esdk::material_providers::types::cryptographic_materials_manager::CryptographicMaterialsManager;
-use aws_esdk::material_providers::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
-use aws_esdk::material_providers::types::error::Error;
-use aws_esdk::material_providers::types::keyring::KeyringRef;
-use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
+use aws_mpl_rs::client as mpl_client;
+use aws_mpl_rs::operation::decrypt_materials::DecryptMaterialsInput;
+use aws_mpl_rs::operation::decrypt_materials::DecryptMaterialsOutput;
+use aws_mpl_rs::operation::get_encryption_materials::GetEncryptionMaterialsInput;
+use aws_mpl_rs::operation::get_encryption_materials::GetEncryptionMaterialsOutput;
+use aws_mpl_rs::types::AlgorithmSuiteId;
+use aws_mpl_rs::types::EsdkAlgorithmSuiteId;
+use aws_mpl_rs::types::cryptographic_materials_manager::CryptographicMaterialsManager;
+use aws_mpl_rs::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
+use aws_mpl_rs::types::error::Error;
+use aws_mpl_rs::types::keyring::KeyringRef;
+use aws_mpl_rs::types::material_providers_config::MaterialProvidersConfig;
 use std::vec::Vec;
 
 /*

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/keyring/aws_kms_discovery_keyring_example.rs

@@ -36,9 +36,9 @@ For more information on KMS Key identifiers, see
 https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id
 */
 
-use aws_esdk::client::Client as esdk_client;
-use aws_esdk::material_providers::types::DiscoveryFilter;
-use aws_esdk::types::*;
+use aws_esdk::Client as EsdkClient;
+use aws_esdk::*;
+use aws_mpl_rs::types::DiscoveryFilter;
 
 pub async fn encrypt_and_decrypt_with_keyring(
     example_data: &str,
@@ -51,8 +51,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     // which enforces that this client only encrypts using committing algorithm suites and enforces
     // that this client will only decrypt encrypted messages that were created with a committing
     // algorithm suite.
-    let esdk_config = AwsEncryptionSdkConfig::default();
-    let esdk_client = esdk_client::from_conf(esdk_config)?;
+    let esdk_client = EsdkClient::default();
 
     // 2. Create a KMS client.
     let sdk_config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;
@@ -79,7 +78,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     // 4. Create the keyring that determines how your data keys are protected.
     //    Although this example highlights Discovery keyrings, Discovery keyrings cannot
     //    be used to encrypt, so for encryption we create a KMS keyring without discovery mode.
-    let mpl = esdk_client::mpl()?;
+    let mpl = EsdkClient::mpl()?;
 
     let encrypt_kms_keyring = mpl
         .create_aws_kms_keyring()

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/keyring/aws_kms_discovery_multi_keyring_example.rs

@@ -33,11 +33,11 @@ For more information on KMS Key identifiers, see
 https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id
 */
 
-use aws_esdk::client as esdk_client;
-use aws_esdk::material_providers::client as mpl_client;
-use aws_esdk::material_providers::types::DiscoveryFilter;
-use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_esdk::types::*;
+use aws_esdk::Client as EsdkClient;
+use aws_esdk::*;
+use aws_mpl_rs::client as mpl_client;
+use aws_mpl_rs::types::DiscoveryFilter;
+use aws_mpl_rs::types::material_providers_config::MaterialProvidersConfig;
 use std::vec::Vec;
 
 pub async fn encrypt_and_decrypt_with_keyring(
@@ -51,8 +51,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     // which enforces that this client only encrypts using committing algorithm suites and enforces
     // that this client will only decrypt encrypted messages that were created with a committing
     // algorithm suite.
-    let esdk_config = AwsEncryptionSdkConfig::default();
-    let esdk_client = esdk_client::Client::from_conf(esdk_config)?;
+    let esdk_client = EsdkClient::default();
 
     // 2. Create a KMS client.
     let sdk_config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/keyring/aws_kms_hierarchical/aws_kms_hierarchical_keyring_example.rs

@@ -39,13 +39,13 @@
 
 use super::create_branch_key_id::create_branch_key_id;
 use super::example_branch_key_id_supplier::ExampleBranchKeyIdSupplier;
-use aws_esdk::client as esdk_client;
-use aws_esdk::key_store::client as keystore_client;
-use aws_esdk::key_store::types::KmsConfiguration;
-use aws_esdk::key_store::types::key_store_config::KeyStoreConfig;
-use aws_esdk::material_providers::client as mpl_client;
-use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_esdk::types::*;
+use aws_esdk::Client as EsdkClient;
+use aws_esdk::*;
+use aws_mpl_rs::aws_cryptography_keyStore::client as keystore_client;
+use aws_mpl_rs::aws_cryptography_keyStore::types::KmsConfiguration;
+use aws_mpl_rs::aws_cryptography_keyStore::types::key_store_config::KeyStoreConfig;
+use aws_mpl_rs::client as mpl_client;
+use aws_mpl_rs::types::material_providers_config::MaterialProvidersConfig;
 
 pub async fn encrypt_and_decrypt_with_keyring(
     example_data: &str,
@@ -59,7 +59,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     // that this client will only decrypt encrypted messages that were created with a committing
     // algorithm suite.
     let esdk_config = AwsEncryptionSdkConfig::default();
-    let esdk_client = esdk_client::Client::from_conf(esdk_config)?;
+    let esdk_client = EsdkClient::from_conf(esdk_config)?;
 
     // 2. Create a KMS client and DynamoDB client.
     let sdk_config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;

AwsEncryptionSDK/runtimes/rust/esdk_rust/esdk/examples/keyring/aws_kms_hierarchical/create_branch_key_id.rs

@@ -1,9 +1,9 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use aws_esdk::key_store::client as keystore_client;
-use aws_esdk::key_store::types::KmsConfiguration;
-use aws_esdk::key_store::types::key_store_config::KeyStoreConfig;
+use aws_mpl_rs::aws_cryptography_keyStore::client as keystore_client;
+use aws_mpl_rs::aws_cryptography_keyStore::types::KmsConfiguration;
+use aws_mpl_rs::aws_cryptography_keyStore::types::key_store_config::KeyStoreConfig;
 
 /*
  The Hierarchical Keyring Example relies on the existence