m

Author: ajewellamz

DynamoDbEncryption/runtimes/rust/src/bin/example/keyring/mod.rs

@@ -1,7 +1,7 @@
 pub mod branch_key_id_supplier;
 pub mod hierarchical_keyring;
 pub mod kms_rsa_keyring;
-// pub mod mrk_discovery_multi_keyring;
+pub mod mrk_discovery_multi_keyring;
 pub mod multi_keyring;
 pub mod multi_mrk_keyring;
 pub mod raw_aes_keyring;

DynamoDbEncryption/runtimes/rust/src/bin/example/keyring/mrk_discovery_multi_keyring.rs

@@ -208,7 +208,7 @@ pub async fn put_item_get_item() {
         .unwrap();
 
     assert_eq!(resp.item, Some(item));
-    println!("raw_rsa_keyring::put_item_get_item successful.");
+    println!("raw_rsa_keyring successful.");
 }
 
 fn exists(f: &str) -> bool {

DynamoDbEncryption/runtimes/rust/src/bin/example/keyring/raw_rsa_keyring.rs

@@ -6,6 +6,7 @@
 #![deny(clippy::all)]
 
 pub mod basic_get_put_example;
+pub mod clientsupplier;
 pub mod create_keystore_key;
 pub mod get_encrypted_data_key_description;
 pub mod itemencryptor;
@@ -25,6 +26,8 @@ pub async fn main() {
     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;
@@ -33,19 +36,18 @@ pub async fn main() {
     println!("Key Store Keys created. Waiting 5 seconds for consistency.");
     std::thread::sleep(std::time::Duration::from_secs(5));
 
-    searchableencryption::basic_searchable_encryption::put_and_query_with_beacon(&key_id).await;
     keyring::hierarchical_keyring::put_item_get_item(&key_id, &key_id2).await;
-    // // FIXME : ScanError will have to wait until we have a reasonable error message strategy
-
-    /*
-    await ClientSupplierExample.ClientSupplierPutItemGetItem();
-    await MrkDiscoveryMultiKeyringExample.MultiMrkDiscoveryKeyringGetItemPutItem();
-    await MultiKeyringExample.MultiKeyringGetItemPutItem();
-
-    await CompoundBeaconSearchableEncryptionExample.PutItemQueryItemWithCompoundBeacon(keyId);
-    await VirtualBeaconSearchableEncryptionExample.PutItemQueryItemWithVirtualBeacon(keyId);
-    await BeaconStylesSearchableEncryptionExample.PutItemQueryItemWithBeaconStyles(keyId);
-    await ComplexSearchableEncryptionExample.RunExample(keyId);
-    */
+
+    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;
+
+    // ScanError will have to wait until we have a reasonable error message strategy
+
     println!("All examples completed successfully.\n");
 }

DynamoDbEncryption/runtimes/rust/src/bin/example/main.rs

@@ -366,5 +366,5 @@ pub async fn put_and_query_with_beacon(branch_key_id: &str) {
         );
         break;
     }
-    println!("put_and_query_with_beacon successful.");
+    println!("basic_searchable_encryption successful.");
 }