Merge branch 'main' into singleton-keyvectors

aws · Jan 17, 2025 · a2207db · a2207db
2 parents d9e2a4f + 21f7fe1
commit a2207db
Show file tree

Hide file tree

Showing 7 changed files with 805 additions and 1 deletion.
diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml
@@ -27,7 +27,7 @@ jobs:
       id-token: write
       contents: read
     env:
-      RUST_MIN_STACK: 104857600
+      RUST_MIN_STACK: 404857600
     steps:
       - name: Support longpaths on Git checkout
         run: |

diff --git a/...re/amazon/cryptography/examples/keyring/SharedCacheAcrossHierarchicalKeyringsExample.java b/...re/amazon/cryptography/examples/keyring/SharedCacheAcrossHierarchicalKeyringsExample.java
diff --git a/...ava/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/TestUtils.java b/...ava/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/TestUtils.java
@@ -6,6 +6,8 @@ public class TestUtils {
   public static final String TEST_LOGICAL_KEYSTORE_NAME = "KeyStoreDdbTable";
   public static final String TEST_KEYSTORE_KMS_KEY_ID =
     "arn:aws:kms:us-west-2:370957321024:key/9d989aa2-2f9c-438c-a745-cc57d3ad0126";
+  public static final String TEST_PARTITION_ID =
+    "91c1b6a2-6fc3-4539-ad5e-938d597ed730";
 
   public static final String TEST_AWS_ACCOUNT_ID = "658956600833";
   public static final String TEST_AWS_REGION = "us-west-2";

diff --git a/...mazon/cryptography/examples/keyring/TestSharedCacheAcrossHierarchicalKeyringsExample.java b/...mazon/cryptography/examples/keyring/TestSharedCacheAcrossHierarchicalKeyringsExample.java
@@ -0,0 +1,32 @@
+package software.amazon.cryptography.examples.keyring;
+
+import org.testng.annotations.Test;
+import software.amazon.cryptography.examples.CreateKeyStoreKeyExample;
+import software.amazon.cryptography.examples.TestUtils;
+
+public class TestSharedCacheAcrossHierarchicalKeyringsExample {
+
+  @Test
+  public void TestSharedCacheAcrossHierarchicalKeyringsExample()
+    throws InterruptedException {
+    // Create new branch key for test
+    String keyId = CreateKeyStoreKeyExample.KeyStoreCreateKey(
+      TestUtils.TEST_KEYSTORE_NAME,
+      TestUtils.TEST_LOGICAL_KEYSTORE_NAME,
+      TestUtils.TEST_KEYSTORE_KMS_KEY_ID
+    );
+
+    // Key creation is eventually consistent, so wait 5 seconds to decrease the likelihood
+    // our test fails due to eventual consistency issues.
+    Thread.sleep(5000);
+
+    SharedCacheAcrossHierarchicalKeyringsExample.SharedCacheAcrossHierarchicalKeyringsGetItemPutItem(
+      TestUtils.TEST_DDB_TABLE_NAME,
+      keyId,
+      TestUtils.TEST_KEYSTORE_NAME,
+      TestUtils.TEST_LOGICAL_KEYSTORE_NAME,
+      TestUtils.TEST_PARTITION_ID,
+      TestUtils.TEST_KEYSTORE_KMS_KEY_ID
+    );
+  }
+}
diff --git a/Examples/runtimes/net/src/Examples.cs b/Examples/runtimes/net/src/Examples.cs
@@ -33,6 +33,7 @@ static async Task Main()
             Thread.Sleep(5000);
 
             await HierarchicalKeyringExample.HierarchicalKeyringGetItemPutItem(keyId, keyId2);
+            await SharedCacheAcrossHierarchicalKeyringsExample.SharedCacheAcrossHierarchicalKeyringsGetItemPutItem(keyId);
 
             await BasicSearchableEncryptionExample.PutItemQueryItemWithBeacon(keyId);
             await CompoundBeaconSearchableEncryptionExample.PutItemQueryItemWithCompoundBeacon(keyId);

diff --git a/Examples/runtimes/net/src/TestUtils.cs b/Examples/runtimes/net/src/TestUtils.cs
@@ -7,6 +7,8 @@ public class TestUtils
     public static readonly string TEST_KEYSTORE_NAME = "KeyStoreDdbTable";
     public static readonly string TEST_LOGICAL_KEYSTORE_NAME = "KeyStoreDdbTable";
 
+    public static readonly string TEST_PARTITION_ID = "91c1b6a2-6fc3-4539-ad5e-938d597ed730";
+
     public static readonly string TEST_KEYSTORE_KMS_KEY_ID =
         "arn:aws:kms:us-west-2:370957321024:key/9d989aa2-2f9c-438c-a745-cc57d3ad0126";
 

diff --git a/Examples/runtimes/net/src/keyring/SharedCacheAcrossHierarchicalKeyringsExample.cs b/Examples/runtimes/net/src/keyring/SharedCacheAcrossHierarchicalKeyringsExample.cs