m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/src/aws_database_encryption_sdk/internal/boto3_conversions.py

@@ -1,8 +1,4 @@
 from abc import ABC, abstractmethod
-from boto3.dynamodb.conditions import (
-    BuiltConditionExpression,
-)
-from copy import deepcopy
 
 class BotoInterfaceShapeConverter(ABC):
     """
@@ -12,22 +8,19 @@ class BotoInterfaceShapeConverter(ABC):
     boto3 resource methods accept different input shapes than boto3 clients, and return different output shapes.
     (The members of these shapes are the same, but some shapes are formatted differently.)
 
-    DBESDK DynamoDB has an internal transformer layer that performs encryption, decryption, and query modification.
+    DBESDK DynamoDB has an internal transformer layer that modifies requests and responses.
     This transformer layer only accepts client-formatted shapes.
 
     This class exists to transform from/to resource shapes to/from client shapes
         for the internal DBESDK DynamoDB transformer layer.
+    This class is also used to transform shapes if the EncryptedClient has expect_standard_dictionaries set to True.
 
     This class is abstract, as some specific transformations depend on the transformation direction.
-    But the structure modelling is the same for both directions, and is expressed here.
-    Implementations of this class should implement the abstract methods to perform the transformations.
+    (ex. Item, Key, AttributeValue, etc.)
+    But many transformations are the same in both directions.
+    That similarity is captured here, and implementations override the abstract methods to perform the transformations
+        specific to the transformation direction.
     """
-    # def key_condition_expression(self, key_condition_expression, expression_attribute_names, expression_attribute_values):
-    #     return self.expression(key_condition_expression, expression_attribute_names, expression_attribute_values)
-
-    # def filter_expression(self, filter_expression, expression_attribute_names, expression_attribute_values):
-    #     return self.expression(filter_expression, expression_attribute_names, expression_attribute_values)
-
     @abstractmethod
     def expression(self, condition_expression, expression_attribute_names, expression_attribute_values):
         raise NotImplementedError("Must be implemented by subclasses")
@@ -99,7 +92,6 @@ def attributes(self, attributes):
         return self.item(attributes)
 
     def item_collection_metrics(self, item_collection_metrics):
-        print(f"{item_collection_metrics=}")
         if "ItemCollectionKey" in item_collection_metrics:
             item_collection_metrics["ItemCollectionKey"] = self.item(item_collection_metrics["ItemCollectionKey"])
         return item_collection_metrics
@@ -283,6 +275,9 @@ def transact_write_items(self, transact_items):
         return output_transact_items
 
     def transact_write_items_response(self, transact_write_items_response):
+        if "ItemCollectionMetrics" in transact_write_items_response:
+            # TODO this works but rename/refactor
+            transact_write_items_response["ItemCollectionMetrics"] = self.batch_write_item_item_collection_metrics(transact_write_items_response["ItemCollectionMetrics"])
         return transact_write_items_response
 
     def transact_get_items_request(self, transact_get_items_request):
@@ -302,13 +297,5 @@ def transact_get_items(self, transact_items):
 
     def transact_get_items_response(self, transact_get_items_response):
         if "Responses" in transact_get_items_response:
-            transact_get_items_response["Responses"] = self.transact_get_items_responses(transact_get_items_response["Responses"])
+            transact_get_items_response["Responses"] = self.items(transact_get_items_response["Responses"])
         return transact_get_items_response
-    
-    def transact_get_items_responses(self, responses):
-        responses_out = []
-        for response in responses:
-            if "Item" in response:
-                response["Item"] = self.item(response["Item"])
-            responses_out.append(response)
-        return responses_out

DynamoDbEncryption/runtimes/python/test/ddb_formatted_requests.py

@@ -220,6 +220,12 @@ def basic_transact_get_item_request_ddb(keys):
         "TransactItems": [{"Get": {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, "Key": key}} for key in keys]
     }
 
+def basic_transact_write_item_condition_check_request_ddb(keys):
+    """Get a transact_write_item request in resource (ddb) format for any items."""
+    return {
+        "TransactItems": [{"ConditionCheck": {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, "Key": key}} for key in keys]
+    }
+
 def basic_query_paginator_request_ddb(key):
     """Get a query paginator request in resource (ddb) format for any item."""
     return {
@@ -230,3 +236,10 @@ def basic_query_paginator_request_ddb(key):
             ":sk": key["sort_key"]
         }
     }
+
+def basic_transact_get_item_request_ddb(keys):
+    """Get a transact_get_item request in resource (ddb) format for any keys."""
+    return {
+        "TransactItems": [{"Get": {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, "Key": key}} for key in keys]
+    }
+

DynamoDbEncryption/runtimes/python/test/dict_formatted_requests.py

@@ -217,6 +217,14 @@ def basic_transact_write_item_delete_request_dict(keys):
     ]
     return basic_transact_write_item_request_dict(actions_with_keys)
 
+def basic_transact_write_item_condition_check_request_dict(keys):
+    """Get a transact_write_item condition check request in resource (dict) format for any keys."""
+    actions_with_keys = [
+        {"ConditionCheck": {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, "Key": key}}
+        for key in keys
+    ]
+    return basic_transact_write_item_request_dict(actions_with_keys)
+
 def basic_transact_get_item_request_dict(keys):
     """Get a transact_get_item request in resource (dict) format for any keys."""
     return {

DynamoDbEncryption/runtimes/python/test/unit/internal/test_client_to_resource.py

@@ -10,6 +10,10 @@
     basic_batch_get_item_request_ddb,
     basic_batch_write_item_put_request_ddb,
     basic_batch_write_item_delete_request_ddb,
+    basic_transact_write_item_put_request_ddb,
+    basic_transact_write_item_delete_request_ddb,
+    basic_transact_write_item_condition_check_request_ddb,
+    basic_transact_get_item_request_ddb,
 )
 from ...dict_formatted_requests import (
     basic_put_item_request_dict,
@@ -23,6 +27,10 @@
     basic_batch_get_item_request_dict,
     basic_batch_write_item_put_request_dict,
     basic_batch_write_item_delete_request_dict,
+    basic_transact_write_item_put_request_dict,
+    basic_transact_write_item_delete_request_dict,
+    basic_transact_write_item_condition_check_request_dict,
+    basic_transact_get_item_request_dict,
 )
 from ...responses import (
     basic_query_response,
@@ -37,6 +45,8 @@
     exhaustive_batch_get_item_response,
     basic_batch_write_item_put_response,
     exhaustive_batch_write_item_put_response,
+    basic_transact_write_items_response,
+    basic_transact_get_items_response,
 )
 from ...items import *
 from aws_database_encryption_sdk.internal.client_to_resource import ClientShapeToResourceShapeConverter
@@ -328,4 +338,92 @@ def test_GIVEN_test_batch_write_item_put_response_WHEN_client_to_resource_THEN_r
     # When: Converting to resource format
     dict_item = client_to_resource_converter.batch_write_item_response(response)
     # Then: Returns dict value
-    assert dict_item == test_batch_write_item_put_response([test_dict_item])
+    assert dict_item == test_batch_write_item_put_response([test_dict_item])
+
+@pytest.fixture
+def test_transact_write_items_put_request_ddb():
+    return basic_transact_write_item_put_request_ddb
+
+@pytest.fixture
+def test_transact_write_items_put_request_dict():
+    return basic_transact_write_item_put_request_dict
+
+def test_GIVEN_test_transact_write_items_put_request_WHEN_client_to_resource_THEN_returns_dict_value(test_transact_write_items_put_request_ddb, test_transact_write_items_put_request_dict, test_ddb_item, test_dict_item):
+    # Given: Transact write item put request
+    request = test_transact_write_items_put_request_ddb([test_ddb_item])
+    # When: Converting to resource format
+    dict_item = client_to_resource_converter.transact_write_items_request(request)
+    # Then: Returns dict value
+    assert dict_item == test_transact_write_items_put_request_dict([test_dict_item])
+
+@pytest.fixture
+def test_transact_write_items_delete_request_ddb():
+    return basic_transact_write_item_delete_request_ddb
+
+@pytest.fixture
+def test_transact_write_items_delete_request_dict():
+    return basic_transact_write_item_delete_request_dict
+
+def test_GIVEN_test_transact_write_items_delete_request_WHEN_client_to_resource_THEN_returns_dict_value(test_transact_write_items_delete_request_ddb, test_transact_write_items_delete_request_dict, test_ddb_key, test_dict_key):
+    # Given: Transact write item delete request
+    request = test_transact_write_items_delete_request_ddb([test_ddb_key])
+    # When: Converting to resource format
+    dict_item = client_to_resource_converter.transact_write_items_request(request)
+    # Then: Returns dict value
+    assert dict_item == test_transact_write_items_delete_request_dict([test_dict_key])
+
+@pytest.fixture
+def test_transact_write_items_condition_check_request_ddb():
+    return basic_transact_write_item_condition_check_request_ddb
+
+@pytest.fixture
+def test_transact_write_items_condition_check_request_dict():
+    return basic_transact_write_item_condition_check_request_dict
+
+def test_GIVEN_test_transact_write_items_condition_check_request_WHEN_client_to_resource_THEN_returns_dict_value(test_transact_write_items_condition_check_request_ddb, test_transact_write_items_condition_check_request_dict, test_ddb_key, test_dict_key):
+    # Given: Transact write item condition check request
+    request = test_transact_write_items_condition_check_request_ddb([test_ddb_key])
+    # When: Converting to resource format
+    dict_item = client_to_resource_converter.transact_write_items_request(request)
+    # Then: Returns dict value
+    assert dict_item == test_transact_write_items_condition_check_request_dict([test_dict_key])
+
+@pytest.fixture
+def test_transact_write_items_response():
+    return basic_transact_write_items_response
+
+def test_GIVEN_test_transact_write_items_response_WHEN_client_to_resource_THEN_returns_dict_value(test_transact_write_items_response, test_ddb_item, test_dict_item):
+    # Given: Transact write items response
+    response = test_transact_write_items_response([test_ddb_item])
+    # When: Converting to resource format
+    dict_item = client_to_resource_converter.transact_write_items_response(response)
+    # Then: Returns dict value
+    assert dict_item == test_transact_write_items_response([test_dict_item])
+
+@pytest.fixture
+def test_transact_get_items_request_ddb():
+    return basic_transact_get_item_request_ddb
+
+@pytest.fixture
+def test_transact_get_items_request_dict():
+    return basic_transact_get_item_request_dict
+
+def test_GIVEN_test_transact_get_items_request_WHEN_client_to_resource_THEN_returns_dict_value(test_transact_get_items_request_ddb, test_transact_get_items_request_dict, test_ddb_key, test_dict_key):
+    # Given: Transact get items request
+    request = test_transact_get_items_request_ddb([test_ddb_key])
+    # When: Converting to resource format
+    dict_item = client_to_resource_converter.transact_get_items_request(request)
+    # Then: Returns dict value
+    assert dict_item == test_transact_get_items_request_dict([test_dict_key])
+
+@pytest.fixture
+def test_transact_get_items_response():
+    return basic_transact_get_items_response
+
+def test_GIVEN_test_transact_get_items_response_WHEN_client_to_resource_THEN_returns_dict_value(test_transact_get_items_response, test_ddb_item, test_dict_item):
+    # Given: Transact get items response
+    response = test_transact_get_items_response([test_ddb_item])
+    # When: Converting to resource format
+    dict_item = client_to_resource_converter.transact_get_items_response(response)
+    # Then: Returns dict value
+    assert dict_item == test_transact_get_items_response([test_dict_item])