m

Author: ajewellamz

DynamoDbEncryption/runtimes/rust/examples/basic_get_put_example.rs

@@ -116,7 +116,7 @@ pub async fn put_item_get_item() -> Result<(), crate::BoxError> {
     // 5. Create a new AWS SDK DynamoDb client using the TableEncryptionConfigs
     let sdk_config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;
     let dynamo_config = aws_sdk_dynamodb::config::Builder::from(&sdk_config)
-        .interceptor(DbEsdkInterceptor::new(table_configs)?)
+        .interceptor(DbEsdkInterceptor::new(table_configs))
         .build();
     let ddb = aws_sdk_dynamodb::Client::from_conf(dynamo_config);
 

DynamoDbEncryption/runtimes/rust/examples/main.rs

@@ -47,36 +47,36 @@ impl<T: std::fmt::Debug> From<T> for BoxError {
 
 #[tokio::main]
 pub async fn main() -> Result<(), BoxError2> {
-    // basic_get_put_example::put_item_get_item().await?;
-    // itemencryptor::item_encrypt_decrypt::encrypt_decrypt().await?;
-    // get_encrypted_data_key_description::get_encrypted_data_key_description().await?;
-    // multi_get_put_example::multi_put_get().await?;
-    // keyring::raw_rsa_keyring::put_item_get_item().await?;
-    // keyring::kms_rsa_keyring::put_item_get_item().await?;
-    // keyring::multi_mrk_keyring::put_item_get_item().await?;
-    // keyring::raw_aes_keyring::put_item_get_item().await?;
-    // keyring::multi_keyring::put_item_get_item().await?;
-    // keyring::mrk_discovery_multi_keyring::put_item_get_item().await?;
-    // clientsupplier::client_supplier_example::put_item_get_item().await?;
+    basic_get_put_example::put_item_get_item().await?;
+    itemencryptor::item_encrypt_decrypt::encrypt_decrypt().await?;
+    get_encrypted_data_key_description::get_encrypted_data_key_description().await?;
+    multi_get_put_example::multi_put_get().await?;
+    keyring::raw_rsa_keyring::put_item_get_item().await?;
+    keyring::kms_rsa_keyring::put_item_get_item().await?;
+    keyring::multi_mrk_keyring::put_item_get_item().await?;
+    keyring::raw_aes_keyring::put_item_get_item().await?;
+    keyring::multi_keyring::put_item_get_item().await?;
+    keyring::mrk_discovery_multi_keyring::put_item_get_item().await?;
+    clientsupplier::client_supplier_example::put_item_get_item().await?;
 
     let key_id = create_keystore_key::keystore_create_key().await?;
-    // let key_id2 = create_keystore_key::keystore_create_key().await?;
+    let key_id2 = create_keystore_key::keystore_create_key().await?;
     // Key creation is eventually consistent, so wait 5 seconds to decrease the likelihood
     // our test fails due to eventual consistency issues.
     println!("Key Store Keys created. Waiting 5 seconds for consistency.");
-    std::thread::sleep(std::time::Duration::from_secs(3));
+    std::thread::sleep(std::time::Duration::from_secs(5));
 
-    // keyring::hierarchical_keyring::put_item_get_item(&key_id, &key_id2).await?;
+    keyring::hierarchical_keyring::put_item_get_item(&key_id, &key_id2).await?;
 
     searchableencryption::basic_searchable_encryption::put_and_query_with_beacon(&key_id).await?;
-    // searchableencryption::beacon_styles_searchable_encryption::put_and_query_with_beacon(&key_id)
-    //     .await?;
-    // searchableencryption::compound_beacon_searchable_encryption::put_and_query_with_beacon(&key_id)
-    //     .await?;
-    // searchableencryption::virtual_beacon_searchable_encryption::put_and_query_with_beacon(&key_id)
-    //     .await?;
-    // searchableencryption::complexexample::complex_searchable_encryption::run_example(&key_id)
-    //     .await?;
+    searchableencryption::beacon_styles_searchable_encryption::put_and_query_with_beacon(&key_id)
+        .await?;
+    searchableencryption::compound_beacon_searchable_encryption::put_and_query_with_beacon(&key_id)
+        .await?;
+    searchableencryption::virtual_beacon_searchable_encryption::put_and_query_with_beacon(&key_id)
+        .await?;
+    searchableencryption::complexexample::complex_searchable_encryption::run_example(&key_id)
+        .await?;
 
     // ScanError will have to wait until we have a reasonable error message strategy
 

DynamoDbEncryption/runtimes/rust/examples/searchableencryption/basic_searchable_encryption.rs

@@ -236,7 +236,7 @@ pub async fn put_and_query_with_beacon(branch_key_id: &str) -> Result<(), crate:
         .keyring(kms_keyring)
         .search(
             SearchConfig::builder()
-                // .write_version(1) // MUST be 1
+                .write_version(1) // MUST be 1
                 .versions(beacon_versions)
                 .build()?,
         )