Merge branch 'main' into jocorell/update-examples

aws · Nov 8, 2024 · a628e11 · a628e11
2 parents c320fe5 + ff3acac
commit a628e11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/...ryptography/dbencryptionsdk/dynamodb/enhancedclient/DynamoDbEnhancedClientEncryption.java b/...ryptography/dbencryptionsdk/dynamodb/enhancedclient/DynamoDbEnhancedClientEncryption.java
@@ -382,6 +382,10 @@ private static DynamoDbTableEncryptionConfig getTableConfig(
       builder = builder.plaintextOverride(configWithSchema.plaintextOverride());
     }
 
+    if (!Objects.isNull(configWithSchema.algorithmSuiteId())) {
+      builder = builder.algorithmSuiteId(configWithSchema.algorithmSuiteId());
+    }
+
     return builder
       .allowedUnsignedAttributePrefix(
         configWithSchema.allowedUnsignedAttributePrefix()

diff --git a/...ography/dbencryptionsdk/dynamodb/enhancedclient/DynamoDbEnhancedClientEncryptionTest.java b/...ography/dbencryptionsdk/dynamodb/enhancedclient/DynamoDbEnhancedClientEncryptionTest.java
@@ -56,6 +56,9 @@ public void TestMultipleTables() {
         .keyring(createKmsKeyring())
         .allowedUnsignedAttributes(Arrays.asList("doNothing"))
         .schemaOnEncrypt(simpleSchema)
+        .algorithmSuiteId(
+          DBEAlgorithmSuiteId.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY_SYMSIG_HMAC_SHA384
+        )
         .build()
     );
     tableConfigs.put(
@@ -102,6 +105,10 @@ public void TestMultipleTables() {
       .config()
       .tableEncryptionConfigs()
       .get("SimpleClassTestTable");
+    assertEquals(
+      DBEAlgorithmSuiteId.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY_SYMSIG_HMAC_SHA384,
+      simpleConfig.algorithmSuiteId()
+    );
     assertEquals(
       CryptoAction.DO_NOTHING,
       simpleConfig.attributeActionsOnEncrypt().get("doNothing")