Merge branch 'main' into ajewell/async-example

Author: ajewellamz

.github/workflows/ci_test_vector_java.yml

@@ -31,7 +31,7 @@ jobs:
         java-version: [8, 11, 16, 17]
         os: [
             # Run on ubuntu image that comes pre-configured with docker
-            ubuntu-latest,
+            ubuntu-22.04,
           ]
     runs-on: ${{ matrix.os }}
     permissions:

.github/workflows/library_rust_tests.yml

@@ -13,6 +13,11 @@ on:
         required: false
         default: false
         type: boolean
+      mpl-head:
+        description: "Running on MPL HEAD"
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   testRust:
@@ -59,6 +64,15 @@ jobs:
         with:
           dafny-version: nightly-2024-12-03-4954170
 
+      - name: Update MPL submodule if using MPL HEAD
+        if: ${{ inputs.mpl-head == true }}
+        working-directory: submodules/MaterialProviders
+        run: |
+          git checkout main
+          git pull
+          git submodule update --init --recursive
+          git rev-parse HEAD
+
       # Remove this after the formatting in Rust starts working
       - name: smithy-dafny Rust hacks
         shell: bash

.github/workflows/pull.yml

@@ -64,3 +64,25 @@ jobs:
     uses: ./.github/workflows/ci_examples_net.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+  pr-ci-all-required:
+    if: always()
+    needs:
+      - getVersion
+      - getVerifyVersion
+      - pr-ci-format
+      - pr-ci-codegen
+      - pr-ci-verification
+      - pr-ci-test-vector-verification
+      - pr-ci-java
+      - pr-ci-java-test-vectors
+      - pr-ci-java-examples
+      - pr-ci-net
+      - pr-ci-rust
+      - pr-ci-net-test-vectors
+      - pr-ci-net-examples
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Verify all required jobs passed
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/keyring/SharedCacheAcrossHierarchicalKeyringsExample.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";

Examples/runtimes/java/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/TestUtils.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
+    );
+  }
+}

Examples/runtimes/java/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/keyring/TestSharedCacheAcrossHierarchicalKeyringsExample.java

@@ -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);

Examples/runtimes/net/src/Examples.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";