m

Author: ajewellamz

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

@@ -3,7 +3,7 @@ use crate::test_utils;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_dynamoDb::types::DynamoDbTableEncryptionConfig;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_structuredEncryption::types::CryptoAction;
 use aws_db_esdk::aws_cryptography_materialProviders::client as mpl_client;
-use aws_db_esdk::aws_cryptography_materialProviders::types::client_supplier::ClientSupplierRef;
+//use aws_db_esdk::aws_cryptography_materialProviders::types::client_supplier::ClientSupplierRef;
 use aws_db_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::aws_cryptography_materialProviders::types::DiscoveryFilter;
 use aws_db_esdk::intercept::DbEsdkInterceptor;
@@ -54,13 +54,13 @@ 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()
-        .client_supplier(supplier_ref.clone())
+        .client_supplier(RegionalRoleClientSupplier {})
         .generator(key_arn)
         .send()
         .await?;
@@ -191,7 +191,7 @@ pub async fn put_item_get_item() -> Result<(), crate::BoxError> {
 
     let mrk_discovery_client_supplier_keyring = mpl
         .create_aws_kms_mrk_discovery_multi_keyring()
-        .client_supplier(supplier_ref.clone())
+        .client_supplier(RegionalRoleClientSupplier {})
         .discovery_filter(discovery_filter)
         .regions(regions)
         .send()

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

@@ -10,7 +10,7 @@ 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_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_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;
@@ -94,12 +94,12 @@ 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_ref)
+        .ddb_key_branch_key_id_supplier(supplier)
         .send()
         .await?
         .branch_key_id_supplier

DynamoDbEncryption/runtimes/rust/src/time.rs

@@ -17,6 +17,14 @@ impl crate::Time::_default {
         }
     }
 
+    #[allow(non_snake_case)]
+    pub fn CurrentRelativeTimeMilli() -> i64 {
+        match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
+            Ok(n) => n.as_millis() as i64,
+            Err(_) => 0,
+        }
+    }
+
     #[allow(non_snake_case)]
     pub fn GetCurrentTimeStamp() -> ::std::rc::Rc<
         _Wrappers_Compile::Result<

releases/rust/db_esdk/Cargo.toml

@@ -22,7 +22,7 @@ aws-lc-sys = "0.21.2"
 aws-sdk-dynamodb = "1.47.0"
 aws-sdk-kms = "1.44.0"
 aws-smithy-runtime-api = {version = "1.7.2", features = ["client"] }
-aws-smithy-types = "1.2.6"
+aws-smithy-types = "1.2.7"
 chrono = "0.4.38"
 dafny_runtime = { path = "dafny_runtime_rust"}
 dashmap = "6.1.0"
@@ -34,4 +34,4 @@ uuid = { version = "1.10.0", features = ["v4"] }
 path = "src/implementation_from_dafny.rs"
 
 [[example]]
-name = "main"
+name = "main"

releases/rust/db_esdk/examples/clientsupplier/client_supplier_example.rs

@@ -3,7 +3,7 @@ use crate::test_utils;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_dynamoDb::types::DynamoDbTableEncryptionConfig;
 use aws_db_esdk::aws_cryptography_dbEncryptionSdk_structuredEncryption::types::CryptoAction;
 use aws_db_esdk::aws_cryptography_materialProviders::client as mpl_client;
-use aws_db_esdk::aws_cryptography_materialProviders::types::client_supplier::ClientSupplierRef;
+// use aws_db_esdk::aws_cryptography_materialProviders::types::client_supplier::ClientSupplierRef;
 use aws_db_esdk::aws_cryptography_materialProviders::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::aws_cryptography_materialProviders::types::DiscoveryFilter;
 use aws_db_esdk::intercept::DbEsdkInterceptor;
@@ -54,13 +54,13 @@ 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()
-        .client_supplier(supplier_ref.clone())
+        .client_supplier(RegionalRoleClientSupplier {})
         .generator(key_arn)
         .send()
         .await?;
@@ -191,7 +191,7 @@ pub async fn put_item_get_item() -> Result<(), crate::BoxError> {
 
     let mrk_discovery_client_supplier_keyring = mpl
         .create_aws_kms_mrk_discovery_multi_keyring()
-        .client_supplier(supplier_ref.clone())
+        .client_supplier(RegionalRoleClientSupplier {})
         .discovery_filter(discovery_filter)
         .regions(regions)
         .send()

releases/rust/db_esdk/src/deps/aws_cryptography_materialProviders/types/client_supplier.rs

@@ -17,6 +17,12 @@ pub struct ClientSupplierRef {
     pub inner: ::std::rc::Rc<std::cell::RefCell<dyn ClientSupplier>>,
 }
 
+impl<T : ClientSupplier + 'static> From<T> for ClientSupplierRef {
+    fn from(value: T) -> Self {
+        Self { inner: std::rc::Rc::new(std::cell::RefCell::new(value)) }
+    }
+}
+
 impl ::std::cmp::PartialEq for ClientSupplierRef {
     fn eq(&self, other: &ClientSupplierRef) -> bool {
         ::std::rc::Rc::ptr_eq(&self.inner, &other.inner)