m

Author: ajewellamz

DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/PutItemTransform.dfy

@@ -16,15 +16,7 @@ module PutItemTransformTest {
     var tableName := GetTableName("no_such_table");
     var input := DDB.PutItemInput(
       TableName := tableName,
-      Item := map[],
-      Expected := None(),
-      ReturnValues := None(),
-      ReturnConsumedCapacity := None(),
-      ReturnItemCollectionMetrics := None(),
-      ConditionalOperator := None(),
-      ConditionExpression := None(),
-      ExpressionAttributeNames := None(),
-      ExpressionAttributeValues := None()
+      Item := map[]
     );
     var transformed := middlewareUnderTest.PutItemInputTransform(
       AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.PutItemInputTransformInput(
@@ -36,25 +28,14 @@ module PutItemTransformTest {
     expect_equal("PutItemInput", transformed.value.transformedInput, input);
   }
 
-  // DynamoDB String :: cast string to DDB.AttributeValue.S
-  function method DS(x : string) : DDB.AttributeValue
-  {
-    DDB.AttributeValue.S(x)
-  }
-
-  function method BasicItem() : DDB.AttributeMap
-  {
-    map[
-      "bar" := DS("baz")
-    ]
-  }
+  const BasicItem : DDB.AttributeMap := map["bar" := DDB.AttributeValue.S("baz")]
 
   method TestPutItemInputMultiFail(plaintextOverride : Option<AwsCryptographyDbEncryptionSdkDynamoDbTypes.PlaintextOverride>) {
     var middlewareUnderTest := TestFixtures.GetDynamoDbEncryptionTransformsMutli(plaintextOverride);
     var tableName := GetTableName("foo");
     var input := DDB.PutItemInput(
       TableName := tableName,
-      Item := BasicItem()
+      Item := BasicItem
     );
     var transformed := middlewareUnderTest.PutItemInputTransform(
       AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.PutItemInputTransformInput(
@@ -79,7 +60,7 @@ module PutItemTransformTest {
     var tableName := GetTableName("foo");
     var input := DDB.PutItemInput(
       TableName := tableName,
-      Item := BasicItem()
+      Item := BasicItem
     );
     var transformed := middlewareUnderTest.PutItemInputTransform(
       AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.PutItemInputTransformInput(
@@ -99,15 +80,7 @@ module PutItemTransformTest {
     var tableName := GetTableName("no_such_table");
     var input := DDB.PutItemInput(
       TableName := tableName,
-      Item := map[],
-      Expected := None(),
-      ReturnValues := None(),
-      ReturnConsumedCapacity := None(),
-      ReturnItemCollectionMetrics := None(),
-      ConditionalOperator := None(),
-      ConditionExpression := None(),
-      ExpressionAttributeNames := None(),
-      ExpressionAttributeValues := None()
+      Item := map[]
     );
     var transformed := middlewareUnderTest.PutItemOutputTransform(
       AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.PutItemOutputTransformInput(

DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy

@@ -124,11 +124,7 @@ module TestFixtures {
       attributeActionsOnEncrypt := config.attributeActionsOnEncrypt,
       allowedUnsignedAttributes := config.allowedUnsignedAttributes,
       allowedUnsignedAttributePrefix := config.allowedUnsignedAttributePrefix,
-      keyring := Some(keyring),
-      cmm := None(),
-      algorithmSuiteId := None(),
-      legacyOverride := None(),
-      plaintextOverride := None()
+      keyring := Some(keyring)
     );
     var encryptor2 : IDynamoDbItemEncryptorClient :- expect DynamoDbItemEncryptor.DynamoDbItemEncryptor(encryptorConfig);
     assert encryptor2 is DynamoDbItemEncryptor.DynamoDbItemEncryptorClient;
@@ -186,10 +182,7 @@ module TestFixtures {
   {
     var matProv :- expect MaterialProviders.MaterialProviders(MaterialProviders.DefaultMaterialProvidersConfig());
     var keyringInput := AwsCryptographyMaterialProvidersTypes.CreateAwsKmsMultiKeyringInput(
-      generator := Some(PUBLIC_US_WEST_2_KMS_TEST_KEY),
-      kmsKeyIds := None(),
-      clientSupplier := None(),
-      grantTokens := None()
+      generator := Some(PUBLIC_US_WEST_2_KMS_TEST_KEY)
     );
     keyring :- expect matProv.CreateAwsKmsMultiKeyring(keyringInput);
   }
@@ -234,11 +227,7 @@ module TestFixtures {
             allowedUnsignedAttributes := Some(["plain"]),
             allowedUnsignedAttributePrefix := None(),
             algorithmSuiteId := None(),
-            keyring := Some(keyring),
-            cmm := None(),
-            search := None,
-            legacyOverride := None,
-            plaintextOverride := None
+            keyring := Some(keyring)
           )
         ]
       )
@@ -248,8 +237,7 @@ module TestFixtures {
 
   // type AttributeActions = map<ComAmazonawsDynamodbTypes.AttributeName, AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.CryptoAction>
 
-  function method GetMultiActions() : AttributeActions
-  {
+  const MultiActions : AttributeActions :=
     map[
       "bar" := SE.SIGN_ONLY,
       "std2" := SE.ENCRYPT_AND_SIGN,
@@ -262,7 +250,6 @@ module TestFixtures {
       "Date" := SE.SIGN_ONLY,
       "TheKeyField" := SE.SIGN_ONLY
     ]
-  }
 
   method GetDynamoDbEncryptionTransformsMutli(plaintextOverride : Option<AwsCryptographyDbEncryptionSdkDynamoDbTypes.PlaintextOverride>)
     returns (encryption: DynamoDbEncryptionTransforms.DynamoDbEncryptionTransformsClient)
@@ -283,14 +270,10 @@ module TestFixtures {
             logicalTableName := "foo",
             partitionKeyName := "bar",
             sortKeyName := None(),
-            attributeActionsOnEncrypt := GetMultiActions(),
+            attributeActionsOnEncrypt := MultiActions,
             allowedUnsignedAttributes := Some(["plain"]),
-            allowedUnsignedAttributePrefix := None(),
-            algorithmSuiteId := None(),
             keyring := Some(keyring),
-            cmm := None(),
             search := Some(search),
-            legacyOverride := None,
             plaintextOverride := plaintextOverride
           )
         ]