Skip to content

Commit d03ab27

Browse files
RitvikKapilaRitvikKapila
authored
chore(rust): clean-up lib.rs (#725)
1 parent 3117b0c commit d03ab27

32 files changed

+191
-123
lines changed

‎AwsEncryptionSDK/runtimes/rust/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For more details about the design and architecture of the AWS Encryption SDK, se
1717

1818
## Examples for AWS Encryption SDK in Rust
1919

20-
Please look at the Examples on how to use the Encryption SDK in Rust [here](https://github.com/aws/aws-encryption-sdk-dafny/tree/mainline/AwsEncryptionSDK/runtimes/rust/examples).
20+
Please look at the Examples on how to use the Encryption SDK in Rust [here](https://github.com/aws/aws-encryption-sdk-dafny/tree/mainline/releases/rust/esdk/examples).
2121

2222
Please note that some examples MAY require internet access and valid AWS credentials, since calls to KMS are made.
2323

‎AwsEncryptionSDK/runtimes/rust/examples/client_supplier/client_supplier_example.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
use super::regional_role_client_supplier::RegionalRoleClientSupplier;
1919
use aws_esdk::client as esdk_client;
2020
use aws_esdk::types::aws_encryption_sdk_config::AwsEncryptionSdkConfig;
21-
use aws_esdk::aws_cryptography_materialProviders::types::error::Error::AwsCryptographicMaterialProvidersException;
22-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
23-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
24-
use aws_esdk::aws_cryptography_materialProviders::types::DiscoveryFilter;
21+
use aws_esdk::material_providers::types::error::Error::AwsCryptographicMaterialProvidersException;
22+
use aws_esdk::material_providers::client as mpl_client;
23+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
24+
use aws_esdk::material_providers::types::DiscoveryFilter;
2525
use std::collections::HashMap;
2626

2727
pub async fn encrypt_and_decrypt_with_keyring(

‎AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use aws_config::Region;
5-
use aws_esdk::aws_cryptography_materialProviders::types::ClientSupplier;
6-
use aws_esdk::aws_cryptography_materialProviders::operation::get_client::GetClientInput;
7-
use aws_esdk::aws_cryptography_materialProviders::types::error::Error;
5+
use aws_esdk::material_providers::types::ClientSupplier;
6+
use aws_esdk::material_providers::operation::get_client::GetClientInput;
7+
use aws_esdk::material_providers::types::error::Error;
88
use aws_esdk::com_amazonaws_kms::client::Client as kms_client;
99
use super::regional_role_client_supplier_config;
1010

‎AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/required_encryption_context/required_encryption_context_example.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ On decrypt, the client MUST supply the key/value pair(s) that were not stored to
1010

1111
use aws_esdk::client as esdk_client;
1212
use aws_esdk::types::aws_encryption_sdk_config::AwsEncryptionSdkConfig;
13-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
14-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
13+
use aws_esdk::material_providers::client as mpl_client;
14+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
1515
use aws_esdk::types::error::Error::AwsCryptographicMaterialProvidersError;
1616
use std::collections::HashMap;
1717
use std::vec::Vec;

‎AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/restrict_algorithm_suite/signing_only_example.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ use super::signing_suite_only_cmm::SigningSuiteOnlyCMM;
1010
use aws_esdk::client as esdk_client;
1111
use aws_esdk::types::aws_encryption_sdk_config::AwsEncryptionSdkConfig;
1212
use aws_esdk::types::error::Error::AwsCryptographicMaterialProvidersError;
13-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
14-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
15-
use aws_esdk::aws_cryptography_materialProviders::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
16-
use aws_esdk::aws_cryptography_materialProviders::types::EsdkAlgorithmSuiteId;
13+
use aws_esdk::material_providers::client as mpl_client;
14+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
15+
use aws_esdk::material_providers::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
16+
use aws_esdk::material_providers::types::EsdkAlgorithmSuiteId;
1717
use std::collections::HashMap;
1818

1919
pub async fn encrypt_and_decrypt_with_cmm(

‎AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/restrict_algorithm_suite/signing_suite_only_cmm.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
use aws_esdk::aws_cryptography_materialProviders::operation::get_encryption_materials::GetEncryptionMaterialsInput;
5-
use aws_esdk::aws_cryptography_materialProviders::operation::get_encryption_materials::GetEncryptionMaterialsOutput;
6-
use aws_esdk::aws_cryptography_materialProviders::operation::decrypt_materials::DecryptMaterialsInput;
7-
use aws_esdk::aws_cryptography_materialProviders::operation::decrypt_materials::DecryptMaterialsOutput;
8-
use aws_esdk::aws_cryptography_materialProviders::types::error::Error;
9-
use aws_esdk::aws_cryptography_materialProviders::types::cryptographic_materials_manager::CryptographicMaterialsManager;
10-
use aws_esdk::aws_cryptography_materialProviders::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
11-
use aws_esdk::aws_cryptography_materialProviders::types::keyring::KeyringRef;
12-
use aws_esdk::aws_cryptography_materialProviders::types::EsdkAlgorithmSuiteId;
13-
use aws_esdk::aws_cryptography_materialProviders::types::AlgorithmSuiteId;
14-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
15-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
4+
use aws_esdk::material_providers::operation::get_encryption_materials::GetEncryptionMaterialsInput;
5+
use aws_esdk::material_providers::operation::get_encryption_materials::GetEncryptionMaterialsOutput;
6+
use aws_esdk::material_providers::operation::decrypt_materials::DecryptMaterialsInput;
7+
use aws_esdk::material_providers::operation::decrypt_materials::DecryptMaterialsOutput;
8+
use aws_esdk::material_providers::types::error::Error;
9+
use aws_esdk::material_providers::types::cryptographic_materials_manager::CryptographicMaterialsManager;
10+
use aws_esdk::material_providers::types::cryptographic_materials_manager::CryptographicMaterialsManagerRef;
11+
use aws_esdk::material_providers::types::keyring::KeyringRef;
12+
use aws_esdk::material_providers::types::EsdkAlgorithmSuiteId;
13+
use aws_esdk::material_providers::types::AlgorithmSuiteId;
14+
use aws_esdk::material_providers::client as mpl_client;
15+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
1616
use std::vec::Vec;
1717

1818
/*

‎AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_discovery_keyring_example.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id
3838

3939
use aws_esdk::client as esdk_client;
4040
use aws_esdk::types::aws_encryption_sdk_config::AwsEncryptionSdkConfig;
41-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
42-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
43-
use aws_esdk::aws_cryptography_materialProviders::types::DiscoveryFilter;
41+
use aws_esdk::material_providers::client as mpl_client;
42+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
43+
use aws_esdk::material_providers::types::DiscoveryFilter;
4444
use aws_esdk::types::error::Error::AwsCryptographicMaterialProvidersError;
4545
use std::collections::HashMap;
4646

‎AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_discovery_multi_keyring_example.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id
3535

3636
use aws_esdk::client as esdk_client;
3737
use aws_esdk::types::aws_encryption_sdk_config::AwsEncryptionSdkConfig;
38-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
39-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
40-
use aws_esdk::aws_cryptography_materialProviders::types::DiscoveryFilter;
38+
use aws_esdk::material_providers::client as mpl_client;
39+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
40+
use aws_esdk::material_providers::types::DiscoveryFilter;
4141
use std::collections::HashMap;
4242
use std::vec::Vec;
4343

‎AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_hierarchical/aws_kms_hierarchical_keyring_example.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ use super::example_branch_key_id_supplier::ExampleBranchKeyIdSupplier;
4242
use aws_esdk::client as esdk_client;
4343
use aws_esdk::types::aws_encryption_sdk_config::AwsEncryptionSdkConfig;
4444
use aws_esdk::types::error::Error::AwsCryptographicMaterialProvidersError;
45-
use aws_esdk::aws_cryptography_keyStore::types::KmsConfiguration;
46-
use aws_esdk::aws_cryptography_keyStore::types::key_store_config::KeyStoreConfig;
47-
use aws_esdk::aws_cryptography_keyStore::client as keystore_client;
48-
use aws_esdk::aws_cryptography_materialProviders::client as mpl_client;
49-
use aws_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
45+
use aws_esdk::key_store::types::KmsConfiguration;
46+
use aws_esdk::key_store::types::key_store_config::KeyStoreConfig;
47+
use aws_esdk::key_store::client as keystore_client;
48+
use aws_esdk::material_providers::client as mpl_client;
49+
use aws_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
5050
use std::collections::HashMap;
5151

5252
pub async fn encrypt_and_decrypt_with_keyring(

‎AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_hierarchical/create_branch_key_id.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
use aws_esdk::aws_cryptography_keyStore::client as keystore_client;
5-
use aws_esdk::aws_cryptography_keyStore::types::key_store_config::KeyStoreConfig;
6-
use aws_esdk::aws_cryptography_keyStore::types::KmsConfiguration;
4+
use aws_esdk::key_store::client as keystore_client;
5+
use aws_esdk::key_store::types::key_store_config::KeyStoreConfig;
6+
use aws_esdk::key_store::types::KmsConfiguration;
77

88
/*
99
The Hierarchical Keyring Example relies on the existence

0 commit comments

Comments
 (0)