From ba3162fe68a25212efb30700feafd6dd1c75bb6f Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:27:25 -0700 Subject: [PATCH 1/6] test(KeyStoreAdmin): ? --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index cdd4885cb..661072e37 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit cdd4885cb22957b04167b11d8b40edbdf4301d8d +Subproject commit 661072e37e252c16dc96c5761935e7b3423ca25b From 6df0462cb3781c5c572161d6e5093caf1ec00c72 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Sun, 25 Aug 2024 21:31:19 -0700 Subject: [PATCH 2/6] test(KeyStoreAdmin): ? --- .../dafny/DynamoDbEncryption/test/BeaconTestFixtures.dfy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/BeaconTestFixtures.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/BeaconTestFixtures.dfy index 7244fa87a..697cb875f 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/BeaconTestFixtures.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/BeaconTestFixtures.dfy @@ -132,7 +132,7 @@ module BeaconTestFixtures { kmsConfiguration := kmsConfig, logicalKeyStoreName := "KeyStoreDdbTable", grantTokens := None, - ddbTableName := "KeyStoreDdbTable", + ddbTableName := Some("KeyStoreDdbTable"), ddbClient := Some(ddbClient), kmsClient := Some(kmsClient) ); From 59ffd2fac4447e284fba185778ac8a0df0b18072 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Sun, 25 Aug 2024 21:39:13 -0700 Subject: [PATCH 3/6] test(KeyStoreAdmin): ? --- .../test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy index 74e12264f..5dd0255ff 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy @@ -67,7 +67,7 @@ module DynamoDbEncryptionBranchKeyIdSupplierTest { kmsConfiguration := kmsConfig, logicalKeyStoreName := logicalKeyStoreName, grantTokens := None, - ddbTableName := branchKeyStoreName, + ddbTableName := Some(branchKeyStoreName), ddbClient := Some(dynamodbClient), kmsClient := Some(kmsClient) ); From f74a9f9475159d780bf94d82b92854904bd746be Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 29 Aug 2024 13:20:54 -0700 Subject: [PATCH 4/6] update verification --- .../dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy index 2667e361c..9d69f6a55 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy @@ -237,7 +237,7 @@ module TestFixtures { assume {:axiom} fresh(encryption.Modifies); } - method GetDynamoDbEncryptionTransforms2(actions : AttributeActions, sortKey : Option) + method GetDynamoDbEncryptionTransforms2(actions : AttributeActions, sortKey : Option) returns (encryption: DynamoDbEncryptionTransforms.DynamoDbEncryptionTransformsClient) ensures encryption.ValidState() ensures fresh(encryption) From 4ceea5d981ea60a1f359961972da45e6cc2ecdfb Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 29 Aug 2024 13:21:28 -0700 Subject: [PATCH 5/6] latest key-store-admin --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 661072e37..3801746b0 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 661072e37e252c16dc96c5761935e7b3423ca25b +Subproject commit 3801746b05a8154a512ffab88aa60d10993c9c79 From 636114353ba225f412a0d45d0f89d53e5bc58729 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:37:39 -0700 Subject: [PATCH 6/6] fix: test HEAD of MPL --- project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.properties b/project.properties index 1a4050afc..1d808a93c 100644 --- a/project.properties +++ b/project.properties @@ -1,5 +1,5 @@ projectJavaVersion=3.6.2-SNAPSHOT -mplDependencyJavaVersion=1.5.1 +mplDependencyJavaVersion=1.5.1-SNAPSHOT dafnyVersion=4.2.0 dafnyVerifyVersion=4.7.0 dafnyRuntimeJavaVersion=4.2.0