m

Author: ajewellamz

DynamoDbEncryption/.gitignore

@@ -3,7 +3,6 @@ ImplementationFromDafny.cs
 TestsFromDafny.cs
 ImplementationFromDafny-cs.dtr
 TestsFromDafny-cs.dtr
-**/bin
 **/obj
 node_modules
 project.properties

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

@@ -1,4 +1,9 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 
+#![deny(warnings, unconditional_panic)]
+#![deny(nonstandard_style)]
+#![deny(clippy::all)]
 
 use std::collections::HashMap;
 use crate::test_utils;
@@ -158,6 +163,6 @@ pub async fn put_item_get_item()
       .unwrap();
 
       assert_eq!(resp.item, Some(item));
-      println!("put_item_get_item Successful.");
+      println!("put_item_get_item successful.");
   }
 

DynamoDbEncryption/runtimes/rust/src/bin/example/itemencryptor/item_encrypt_decrypt.rs

@@ -1,3 +1,10 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#![deny(warnings, unconditional_panic)]
+#![deny(nonstandard_style)]
+#![deny(clippy::all)]
+
 use std::collections::HashMap;
 use crate::test_utils;
 use aws_sdk_dynamodb::types::AttributeValue;

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

@@ -1 +1,8 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#![deny(warnings, unconditional_panic)]
+#![deny(nonstandard_style)]
+#![deny(clippy::all)]
+
 pub mod item_encrypt_decrypt;

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

@@ -1,14 +1,29 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#![deny(warnings, unconditional_panic)]
+#![deny(nonstandard_style)]
+#![deny(clippy::all)]
 
 pub mod basic_get_put_example;
 pub mod test_utils;
 pub mod itemencryptor;
 pub mod searchableencryption;
+pub mod create_keystore_key;
 
 #[tokio::main]
 pub async fn main() {
     basic_get_put_example::put_item_get_item().await;
     itemencryptor::item_encrypt_decrypt::encrypt_decrypt().await;
-    /*
+
+    let key_id = 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.
+    std::thread::sleep(std::time::Duration::from_secs(5));
+
+    searchableencryption::basic_searchable_encryption::put_and_query_with_beacon(&key_id).await;
+/*
 
             await ScanErrorExample.ScanError();
             await GetEncryptedDataKeyDescriptionExample.GetEncryptedDataKeyDescription();
@@ -21,15 +36,8 @@ pub async fn main() {
             await RawRsaKeyringExample.RawRsaKeyringGetItemPutItem();
             await KmsRsaKeyringExample.KmsRsaKeyringGetItemPutItem();
 
-            var keyId = CreateKeyStoreKeyExample.KeyStoreCreateKey();
-            var keyId2 = CreateKeyStoreKeyExample.KeyStoreCreateKey();
-            // Key creation is eventually consistent, so wait 5 seconds to decrease the likelihood
-            // our test fails due to eventual consistency issues.
-            Thread.Sleep(5000);
 
             await HierarchicalKeyringExample.HierarchicalKeyringGetItemPutItem(keyId, keyId2);
-
-            await BasicSearchableEncryptionExample.PutItemQueryItemWithBeacon(keyId);
             await CompoundBeaconSearchableEncryptionExample.PutItemQueryItemWithCompoundBeacon(keyId);
             await VirtualBeaconSearchableEncryptionExample.PutItemQueryItemWithVirtualBeacon(keyId);
             await BeaconStylesSearchableEncryptionExample.PutItemQueryItemWithBeaconStyles(keyId);

DynamoDbEncryption/runtimes/rust/src/bin/example/searchableencryption/basic_searchable_encryption.rs

@@ -1 +1,8 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#![deny(warnings, unconditional_panic)]
+#![deny(nonstandard_style)]
+#![deny(clippy::all)]
+
 pub mod basic_searchable_encryption;

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

@@ -1,3 +1,10 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#![deny(warnings, unconditional_panic)]
+#![deny(nonstandard_style)]
+#![deny(clippy::all)]
+
 pub const TEST_KEYSTORE_NAME : &str = "KeyStoreDdbTable";
 pub const TEST_LOGICAL_KEYSTORE_NAME : &str = "KeyStoreDdbTable";