client coverage

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/src/aws_database_encryption_sdk/encrypted/client.py

@@ -179,16 +179,18 @@ def _copy_missing_sdk_output_fields_to_response(self, sdk_output, response, outp
     def update_item(self, **kwargs):
         raise NotImplementedError('"update_item" is not yet implemented')
 
-    def batch_writer(self, overwrite_by_pkeys=None):
-        """Create a batch writer object.
+    def batch_writer(
+        self,
+        overwrite_by_pkeys: list[str] | None
+    ):
+        """Create a batch writer object that will transparently encrypt requests to DynamoDB.
 
         https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb/table/batch_writer.html
 
-        :type overwrite_by_pkeys: list(string)
-        :param overwrite_by_pkeys: De-duplicate request items in buffer if match new request
-            item on specified primary keys. i.e ``["partition_key1", "sort_key2", "sort_key3"]``
+        Parameters:
+            overwrite_by_pkeys: De-duplicate request items in buffer if match new request
+                item on specified primary keys. i.e ``["partition_key1", "sort_key2", "sort_key3"]``
         """
-        print("making encrypted client")
         encrypted_client = EncryptedClient(
             client = self._table.meta.client,
             encryption_config = self._encryption_config,

DynamoDbEncryption/runtimes/python/src/aws_database_encryption_sdk/encrypted/table.py

@@ -251,3 +251,5 @@ def batch_write_item_item_collection_metrics(self, item_collection_metrics):
             table_value = self.item_collection_metrics(table_value)
             item_collection_metrics_out[table_name] = table_value
         return item_collection_metrics_out
+
+    def 

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

@@ -81,4 +81,41 @@ def expression(self, condition_expression, expression_attribute_names, expressio
         # Expressions provided to tables can also already be string-like.
         # Assume the user has provided something string-like, and let Smithy-Python/DBESDK internals raise exceptions if not.
         print(f"probably a string: {condition_expression=}")
-        return condition_expression
+        return condition_expression
+
+    def batch_write_item_request_items(self, tables):
+        """Transform a batch write request's items to DynamoDB format."""
+        output_tables = []
+        table_names = list(tables.keys())
+        for table_name in table_names:
+            requests = tables[table_name]
+            output_requests = []
+            for request in requests:
+                request_name_list = list(request.keys())
+                if len(request_name_list) > 1:
+                    raise ValueError("Invalid JSON format")
+                request_name = request_name_list[0]
+                if request_name == "PutRequest":
+                    dict_request = dict_to_ddb(request[request_name]["Item"])
+                    boto3_request = {"Item": dict_request}
+                elif request_name == "DeleteRequest":
+                    # Delete requests are based on Keys, which are expected to already be in DynamoDB JSON.
+                    # Only Items can be in Python dictionary JSON.
+                    boto3_request = request[request_name]
+                else:
+                    raise ValueError(f"Unknown batch_write_items method key: {request_name}")
+                output_requests.append({request_name: boto3_request})
+            output_tables.append({table_name: output_requests})
+        return output_tables
+
+    def batch_get_request(self, **kwargs):
+        """Transform a batch get request to DynamoDB format."""
+        dynamodb_input = kwargs.copy()
+        tables = dynamodb_input["RequestItems"]
+        
+        for table_name, table_data in tables.items():
+            dynamodb_input["RequestItems"][table_name]["Keys"] = [
+                self.key_to_attribute_value_map(key) for key in table_data["Keys"]
+            ]
+            
+        return dynamodb_input

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

@@ -13,20 +13,47 @@
 
 
 def dict_to_ddb(item: Dict[str, Any]) -> Dict[str, Any]:
-    """Converts a native Python dictionary to a raw DynamoDB item.
+    """Converts a native Python dictionary to a DynamoDB-JSON item.
 
-    :param dict item: Native item
-    :returns: DynamoDB item
+    Args:
+        item (Dict[str, Any]): Native Python dictionary.
+
+    Returns:
+        Dict[str, Any]: DynamoDB-formatted item.
     """
     serializer = TypeSerializer()
     return {key: serializer.serialize(value) for key, value in item.items()}
 
+def list_of_dict_to_list_of_ddb(items: list[Dict[str, Any]]) -> list[Dict[str, Any]]:
+    """Converts a list of Python dictionaries into a list of DynamoDB-JSON formatted items.
+
+    Args:
+        items (List[Dict[str, Any]]): List of native Python dictionaries.
+
+    Returns:
+        List[Dict[str, Any]]: List of DynamoDB-formatted items.
+    """
+    return [dict_to_ddb(item) for item in items]
 
 def ddb_to_dict(item: Dict[str, Any]) -> Dict[str, Any]:
-    """Converts a raw DynamoDB item to a native Python dictionary.
+    """Converts a DynamoDB-JSON item to a native Python dictionary.
+
+    Args:
+        item (Dict[str, Any]): DynamoDB-formatted item.
 
-    :param dict item: DynamoDB item
-    :returns: Native item
+    Returns:
+        Dict[str, Any]: Native Python dictionary.
     """
     deserializer = TypeDeserializer()
     return {key: deserializer.deserialize(value) for key, value in item.items()}
+
+def list_of_ddb_to_list_of_dict(items: list[Dict[str, Any]]) -> list[Dict[str, Any]]:
+    """Converts a list of DynamoDB-JSON formatted items to a list of Python dictionaries.
+
+    Args:
+        items (List[Dict[str, Any]]): List of DynamoDB-formatted items.
+
+    Returns:
+        List[Dict[str, Any]]: List of native Python dictionaries.
+    """
+    return [ddb_to_dict(item) for item in items]

DynamoDbEncryption/runtimes/python/src/aws_database_encryption_sdk/transform.py

@@ -151,8 +151,8 @@ def encrypted_client_put_get_example(
     #    The client will decrypt the item client-side, and return
     #    back the original item.
     key_to_get = {
-        "partition_key": "BasicPutGetExample",
-        "sort_key": 0,
+        "partition_key": {"S": "BasicPutGetExample"},
+        "sort_key": {"N": "0"}
     }
 
     get_item_request = {
@@ -167,4 +167,4 @@ def encrypted_client_put_get_example(
     print(f"{item_to_encrypt=}")
     print(f"{get_item_response['Item']=}")
     # assert get_item_response["Item"] == item_to_encrypt
-    assert get_item_response["Item"]["attribute1"] == {"S" : "encrypt and sign me!"}
+    assert get_item_response["Item"]["attribute1"] == "encrypt and sign me!"