m

Author: ajewellamz

DynamoDbEncryption/Makefile

@@ -7,6 +7,8 @@ include ../SharedMakefile.mk
 
 DIR_STRUCTURE_V2=V2
 
+TRANSPILE_TESTS_IN_RUST=1
+
 PROJECT_SERVICES := \
 	DynamoDbEncryption \
 	DynamoDbItemEncryptor \

DynamoDbEncryption/runtimes/rust/examples/clientsupplier/client_supplier_example.rs

@@ -54,9 +54,9 @@ pub async fn put_item_get_item() -> Result<(), crate::BoxError> {
     // defined in the RegionalRoleClientSupplier class in this directory.
     // Note: RegionalRoleClientSupplier will internally use the key_arn's region
     // to retrieve the correct IAM role.
-//    let supplier_ref = ClientSupplierRef {
-//        inner: std::rc::Rc::new(std::cell::RefCell::new(RegionalRoleClientSupplier {})),
-//    };
+    //    let supplier_ref = ClientSupplierRef {
+    //        inner: std::rc::Rc::new(std::cell::RefCell::new(RegionalRoleClientSupplier {})),
+    //    };
 
     let mrk_keyring_with_client_supplier = mpl
         .create_aws_kms_mrk_multi_keyring()

DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs

@@ -13,7 +13,7 @@ use aws_db_esdk::deps::com_amazonaws_kms::client::Client as kms_client;
 pub struct RegionalRoleClientSupplier {}
 
 impl ClientSupplier for RegionalRoleClientSupplier {
-    fn get_client(&mut self, input: GetClientInput) -> Result<kms_client, Error> {
+    fn get_client(&self, input: GetClientInput) -> Result<kms_client, Error> {
         let region = input.region.unwrap();
         let arn =
             super::regional_role_client_supplier_config::region_iam_role_map()[&region].clone();

DynamoDbEncryption/runtimes/rust/examples/keyring/branch_key_id_supplier.rs

@@ -30,7 +30,7 @@ impl ExampleBranchKeyIdSupplier {
 
 impl DynamoDbKeyBranchKeyIdSupplier for ExampleBranchKeyIdSupplier {
     fn get_branch_key_id_from_ddb_key(
-        &mut self,
+        &self,
         input: GetBranchKeyIdFromDdbKeyInput,
     ) -> Result<GetBranchKeyIdFromDdbKeyOutput, Error> {
         let key = input.ddb_key.unwrap();

DynamoDbEncryption/runtimes/rust/examples/keyring/hierarchical_keyring.rs

@@ -1,22 +1,22 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+use super::branch_key_id_supplier::ExampleBranchKeyIdSupplier;
 use crate::test_utils;
-use aws_db_esdk::aws_cryptography_keyStore::types::KmsConfiguration;
-use aws_db_esdk::aws_cryptography_keyStore::types::key_store_config::KeyStoreConfig;
-use aws_db_esdk::aws_cryptography_materialProviders::client as mpl_client;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_dynamoDb::client as dbesdk_client;
-use aws_db_esdk::aws_cryptography_keyStore::client as keystore_client;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_dynamoDb::types::dynamo_db_encryption_config::DynamoDbEncryptionConfig;
-use super::branch_key_id_supplier::ExampleBranchKeyIdSupplier;
+use aws_db_esdk::aws_cryptography_keyStore::client as keystore_client;
+use aws_db_esdk::aws_cryptography_keyStore::types::key_store_config::KeyStoreConfig;
+use aws_db_esdk::aws_cryptography_keyStore::types::KmsConfiguration;
+use aws_db_esdk::aws_cryptography_materialProviders::client as mpl_client;
 use aws_db_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
 //use aws_db_esdk::aws_cryptography_dbEncryptionSdk_dynamoDb::types::dynamo_db_key_branch_key_id_supplier::DynamoDbKeyBranchKeyIdSupplierRef;
-use aws_db_esdk::aws_cryptography_dbEncryptionSdk_structuredEncryption::types::CryptoAction;
-use std::collections::HashMap;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_dynamoDb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::DynamoDbTablesEncryptionConfig;
+use aws_db_esdk::aws_cryptography_dbEncryptionSdk_structuredEncryption::types::CryptoAction;
 use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
+use std::collections::HashMap;
 
 /*
  This example sets up DynamoDb Encryption for the AWS SDK client
@@ -94,9 +94,9 @@ pub async fn put_item_get_item(
     let dbesdk_config = DynamoDbEncryptionConfig::builder().build()?;
     let dbesdk = dbesdk_client::Client::from_conf(dbesdk_config)?;
     let supplier = ExampleBranchKeyIdSupplier::new(tenant1_branch_key_id, tenant2_branch_key_id);
-//    let supplier_ref = DynamoDbKeyBranchKeyIdSupplierRef {
-//        inner: ::std::rc::Rc::new(std::cell::RefCell::new(supplier)),
-//    };
+    //    let supplier_ref = DynamoDbKeyBranchKeyIdSupplierRef {
+    //        inner: ::std::rc::Rc::new(std::cell::RefCell::new(supplier)),
+    //    };
     let branch_key_id_supplier = dbesdk
         .create_dynamo_db_encryption_branch_key_id_supplier()
         .ddb_key_branch_key_id_supplier(supplier)

DynamoDbEncryption/runtimes/rust/src/hmac.rs

@@ -55,7 +55,7 @@ pub mod HMAC {
     }
     pub struct HMac {
         algorithm: hmac::Algorithm,
-        inner: RefCell<HMacInner>
+        inner: RefCell<HMacInner>,
     }
 
     impl dafny_runtime::UpcastObject<dyn std::any::Any> for HMac {
@@ -66,10 +66,14 @@ pub mod HMAC {
         pub fn Init(&self, salt: &::dafny_runtime::Sequence<u8>) {
             let salt: Vec<u8> = salt.iter().collect();
             self.inner.borrow_mut().key = Some(hmac::Key::new(self.algorithm, &salt));
-            self.inner.borrow_mut().context = Some(hmac::Context::with_key(self.inner.borrow().key.as_ref().unwrap()));
+            let context = Some(hmac::Context::with_key(self.inner.borrow().key.as_ref().unwrap()));
+            self.inner.borrow_mut().context = context;
         }
         pub fn re_init(&self) {
-            self.inner.borrow_mut().context = Some(hmac::Context::with_key(self.inner.borrow().key.as_ref().unwrap()));
+            let context = Some(hmac::Context::with_key(
+                self.inner.borrow().key.as_ref().unwrap(),
+            ));
+            self.inner.borrow_mut().context = context;
         }
         pub fn Build(
             input: &::std::rc::Rc<
@@ -85,30 +89,33 @@ pub mod HMAC {
         > {
             let inner = dafny_runtime::Object::new(Self {
                 algorithm: super::convert_algorithm(input),
-                inner : RefCell::new(HMacInner {
+                inner: RefCell::new(HMacInner {
                     context: None,
                     key: None,
-                })
+                }),
             });
 
             ::std::rc::Rc::new(_Wrappers_Compile::Result::Success { value: inner })
         }
         pub fn BlockUpdate(&self, block: &::dafny_runtime::Sequence<u8>) {
             let part: Vec<u8> = block.iter().collect();
-            self.inner.borrow_mut().context.as_mut().unwrap().update(&part);
+            self.inner
+                .borrow_mut()
+                .context
+                .as_mut()
+                .unwrap()
+                .update(&part);
         }
         pub fn GetResult(&self) -> ::dafny_runtime::Sequence<u8> {
-            let inner = self.inner.borrow_mut().context.take();
-            match inner {
-                Some(x) => {
-                    let tag = x.sign();
-                    // other languages allow you to call BlockUpdate after GetResult
-                    // so we re-initialize to mimic that behavior
-                    self.re_init();
-                    tag.as_ref().iter().cloned().collect()
-                }
-                None => [].iter().cloned().collect(),
+            let is_empty = self.inner.borrow().context.is_none();
+            if is_empty {
+                return [].iter().cloned().collect();
             }
+            let tag = self.inner.borrow_mut().context.take().unwrap().sign();
+            // other languages allow you to call BlockUpdate after GetResult
+            // so we re-initialize to mimic that behavior
+            self.re_init();
+            tag.as_ref().iter().cloned().collect()
         }
     }
 }