m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/test/constants.py

@@ -39,7 +39,6 @@
 INTEG_TEST_DEFAULT_ALGORITHM_SUITE_ID = (
     DBEAlgorithmSuiteId.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY_ECDSA_P384_SYMSIG_HMAC_SHA384
 )
-# 4. Create the DynamoDb Encryption configuration for the table we will be writing to.
 INTEG_TEST_DEFAULT_TABLE_CONFIG = DynamoDbTableEncryptionConfig(
     logical_table_name=INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
     partition_key_name=INTEG_TEST_DEFAULT_PARTITION_KEY_NAME,

DynamoDbEncryption/runtimes/python/test/requests.py

@@ -57,9 +57,16 @@ def base_transact_get_item_request(keys):
 
 # Base exhaustive request structures that are shared between DDB and dict formats
 
+# No exhaustive requests are intended to be able to be used as real requests.
+# Some parameters conflict with each other when sent to DynamoDB.
+# These are only intended to test the conversion of the request from client to resource format.
 
 def base_exhaustive_put_item_request(item):
-    """Base structure for exhaustive put_item requests."""
+    """Base structure for exhaustive put_item requests.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     return {
         # Expected is legacy, but still in the boto3 docs.
         "Expected": {
@@ -78,7 +85,11 @@ def base_exhaustive_put_item_request(item):
 
 
 def base_exhaustive_get_item_request(item):
-    """Base structure for exhaustive get_item requests."""
+    """Base structure for exhaustive get_item requests.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     return {
         "ReturnConsumedCapacity": "TOTAL",
         "ReturnItemCollectionMetrics": "SIZE",
@@ -95,7 +106,11 @@ def base_exhaustive_get_item_request(item):
 
 
 def base_exhaustive_query_request(item):
-    """Base structure for exhaustive query requests."""
+    """Base structure for exhaustive query requests.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     return {
         "IndexName": "index_name",
         "Select": "SPECIFIC_ATTRIBUTES",
@@ -119,7 +134,11 @@ def base_exhaustive_query_request(item):
 
 
 def base_exhaustive_scan_request(item):
-    """Base structure for exhaustive scan requests."""
+    """Base structure for exhaustive scan requests.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     return {
         "IndexName": "index_name",
         "AttributesToGet": ["partition_key", "sort_key", "attribute1", "attribute2"],
@@ -267,8 +286,14 @@ def basic_put_item_request_dict(item):
 
 
 def exhaustive_put_item_request_dict(item):
-    """Get a put_item request in dict format for any item."""
+    """Get a put_item request in dict format for any item.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     base = basic_put_item_request_dict(item)
+    # Replace the default ConditionExpression string with a ConditionExpression object
+    # to increase test coverage.
     additional_keys = base_exhaustive_put_item_request(item)
     additional_keys["ConditionExpression"] = Attr("#pk").not_exists() & Attr("#sk").not_exists()
     return {**base, **additional_keys}
@@ -280,7 +305,11 @@ def basic_get_item_request_dict(item):
 
 
 def exhaustive_get_item_request_dict(item):
-    """Get a get_item request in dict format for any item."""
+    """Get a get_item request in dict format for any item.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     base = basic_get_item_request_dict(item)
     additional_keys = base_exhaustive_get_item_request(item)
     return {**base, **additional_keys}
@@ -296,12 +325,17 @@ def basic_query_request_dict(item):
 def basic_query_request_dict_condition_expression(item):
     """Get a query request in dict format for any item."""
     base = base_query_request(item)
-    # Override base KeyConditionExpression to use ConditionExpressions
+    # Replace the default KeyConditionExpression string with a ConditionExpression object
+    # to increase test coverage.
     return {"KeyConditionExpression": Key("partition_key").eq(item["partition_key"]), **base}
 
 
 def exhaustive_query_request_dict(item):
-    """Get a query request in dict format for any item."""
+    """Get a query request in dict format for any item.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     base = basic_query_request_dict(item)
     additional_keys = base_exhaustive_query_request(item)
     return {**base, **additional_keys}
@@ -313,7 +347,11 @@ def basic_scan_request_dict(item):
 
 
 def exhaustive_scan_request_dict(item):
-    """Get a scan request in dict format for any item."""
+    """Get a scan request in dict format for any item.
+    This is not intended to be able to be used as a real request.
+    Some parameters conflict with each other when sent to DynamoDB.
+    This is only intended to test the conversion of the request from client to resource format.
+    """
     base = basic_scan_request_dict(item)
     additional_keys = base_exhaustive_scan_request(item)
     return {**base, **additional_keys}

DynamoDbEncryption/runtimes/python/test/responses.py

@@ -7,7 +7,11 @@ def basic_put_item_response(item):
 
 
 def exhaustive_put_item_response(item):
-    """Get a put_item response in resource (ddb) format for any item."""
+    """Get a put_item response in resource (ddb) format for any item.
+    This is not intended to be a real response that DynamoDB would return,
+    but the response should contain additional attributes that DynamoDB could return.
+    This is only intended to exhaustively test the conversion of the request from client to resource format.
+    """
     base = basic_put_item_response(item)
     additional_keys = {
         "ConsumedCapacity": {"CapacityUnits": 1, "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME},
@@ -27,7 +31,11 @@ def basic_get_item_response(item):
 
 
 def exhaustive_get_item_response(item):
-    """Get a get_item response in resource (ddb) format for any item."""
+    """Get a get_item response in resource (ddb) format for any item.
+    This is not intended to be a real response that DynamoDB would return,
+    but the response should contain additional attributes that DynamoDB could return.
+    This is only intended to exhaustively test the conversion of the request from client to resource format.
+    """
     base = basic_get_item_response(item)
     additional_keys = {
         "ConsumedCapacity": {"CapacityUnits": 1, "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME},
@@ -46,7 +54,11 @@ def basic_query_response(items):
 
 
 def exhaustive_query_response(items):
-    """Get a query response in resource (ddb) format for any items."""
+    """Get a query response in resource (ddb) format for any items.
+    This is not intended to be a real response that DynamoDB would return,
+    but the response should contain additional attributes that DynamoDB could return.
+    This is only intended to exhaustively test the conversion of the request from client to resource format.
+    """
     base = basic_query_response(items)
     additional_keys = {
         "LastEvaluatedKey": {"partition_key": items[-1]["partition_key"]},
@@ -62,7 +74,11 @@ def basic_scan_response(items, keys):
 
 
 def exhaustive_scan_response(items, keys):
-    """Get a scan response in resource (ddb) format for any items."""
+    """Get a scan response in resource (ddb) format for any items.
+    This is not intended to be a real response that DynamoDB would return,
+    but the response should contain additional attributes that DynamoDB could return.
+    This is only intended to exhaustively test the conversion of the request from client to resource format.
+    """
     base = basic_scan_response(items, keys)
     additional_keys = {
         "ConsumedCapacity": {"CapacityUnits": 1, "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME},
@@ -79,7 +95,11 @@ def basic_batch_get_item_response(items):
 
 
 def exhaustive_batch_get_item_response(items):
-    """Get a batch_get_item response in resource (ddb) format for any items."""
+    """Get a batch_get_item response in resource (ddb) format for any items.
+    This is not intended to be a real response that DynamoDB would return,
+    but the response should contain additional attributes that DynamoDB could return.
+    This is only intended to exhaustively test the conversion of the request from client to resource format.
+    """
     base = basic_batch_get_item_response(items)
     additional_keys = {
         "UnprocessedKeys": {
@@ -99,7 +119,11 @@ def basic_batch_write_item_put_response(items):
 
 
 def exhaustive_batch_write_item_put_response(items):
-    """Get a batch_write_item response in resource (ddb) format for any items."""
+    """Get a batch_write_item response in resource (ddb) format for any items.
+    This is not intended to be a real response that DynamoDB would return,
+    but the response should contain additional attributes that DynamoDB could return.
+    This is only intended to exhaustively test the conversion of the request from client to resource format.
+    """
     base = basic_batch_write_item_put_response(items)
     additional_keys = {
         "ItemCollectionMetrics": {

TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBTable.py

@@ -130,7 +130,14 @@ def get_item(self, **kwargs):
 
     def batch_write_item(self, **kwargs):
         table_input = self._client_shape_to_resource_shape_converter.batch_write_item_request(kwargs)
-        table_output = self._table.batch_write_item(**table_input)
+        # table_output = self._table.batch_write_item(**table_input)
+        batch_writer = self._table.batch_writer()
+        for item in table_input["Items"]:
+            if "PutRequest" in item:
+                batch_writer.put_item(item["PutRequest"]["Item"])
+            elif "DeleteRequest" in item:
+                batch_writer.delete_item(item["DeleteRequest"]["Key"])
+        table_output = batch_writer.close()
         client_output = self._resource_shape_to_client_shape_converter.batch_write_item_response(table_output)
         return client_output
 

TestVectors/runtimes/python/test/resource/test_dafny_wrapper.py

@@ -9,6 +9,7 @@
 """
 
 import sys
+from functools import partial
 
 # Different from standard test_dafny_wrapper due to weird test structure.
 test_dir = '/'.join(__file__.split("/")[:-2])
@@ -48,11 +49,13 @@
 def EmptyTest(*args, **kwargs):
   print(f"Skipping test {kwargs['test_name']} because {kwargs['reason']}")
 
-aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactWriteItems = EmptyTest(
+aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactWriteItems = partial(
+  EmptyTest,
   test_name="BasicIoTestTransactWriteItems",
   reason="neither DDB resources nor DDB tables support transact_write_items"
 )
-aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactGetItems = EmptyTest(
+aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactGetItems = partial(
+  EmptyTest,
   test_name="BasicIoTestTransactGetItems",
   reason="neither DDB resources nor DDB tables support transact_get_items"
 )

TestVectors/runtimes/python/test/table/test_dafny_wrapper.py

@@ -9,7 +9,7 @@
 """
 
 import sys
-
+from functools import partial
 # Different from standard test_dafny_wrapper due to weird test structure.
 test_dir = '/'.join(__file__.split("/")[:-2])
 
@@ -39,15 +39,18 @@
 def EmptyTest(*args, **kwargs):
   print(f"Skipping test {kwargs['test_name']} because {kwargs['reason']}")
 
-aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactGetItems = EmptyTest(
+aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactGetItems = partial(
+  EmptyTest,
   test_name="BasicIoTestTransactGetItems",
   reason="DDB tables do not support transact_get_items"
 )
-aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactWriteItems = EmptyTest(
+aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestTransactWriteItems = partial(
+  EmptyTest,
   test_name="BasicIoTestTransactWriteItems",
   reason="DDB tables do not support transact_write_items"
 )
-aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestBatchGetItems = EmptyTest(
+aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.DdbEncryptionTestVectors.TestVectorConfig.BasicIoTestBatchGetItems = partial(
+  EmptyTest,
   test_name="BasicIoTestBatchGetItems",
   reason="DDB tables do not support batch_get_item"
 )