m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/internal/client_to_resource.py

@@ -68,6 +68,20 @@ def query_response(self, query_response):
     def scan_request(self, scan_request):
         out = self.boto3_converter.ScanInput(scan_request)
         # scan requests on a boto3.resource.Table do not have a table name.
+        if self.delete_table_name:
+            del out["TableName"]
+        return out 
+
+    def delete_item_request(self, delete_item_request):
+        out = self.boto3_converter.DeleteItemInput(delete_item_request)
+        # delete_item requests on a boto3.resource.Table do not have a table name.
+        if self.delete_table_name:
+            del out["TableName"]
+        return out
+    
+    def update_item_request(self, update_item_request):
+        out = self.boto3_converter.UpdateItemInput(update_item_request)
+        # update_item requests on a boto3.resource.Table do not have a table name.
         if self.delete_table_name:
             del out["TableName"]
         return out
@@ -99,20 +113,14 @@ def batch_write_item_request(self, batch_write_item_request):
     def batch_write_item_response(self, batch_write_item_response):
         return self.boto3_converter.BatchWriteItemOutput(batch_write_item_response)
 
-    def update_item_request(self, update_item_request):
-        return self.boto3_converter.UpdateItemInput(update_item_request)
-
     def update_item_response(self, update_item_response):
-        return self.boto3_converter.UpdateItemOutput(update_item_response)
+        raise NotImplementedError("update_item response handling is not implemented")
 
     def batch_execute_statement_request(self, batch_execute_statement_request):
         return self.boto3_converter.BatchExecuteStatementInput(batch_execute_statement_request)
 
     def batch_execute_statement_response(self, batch_execute_statement_response):
-        return self.boto3_converter.BatchExecuteStatementOutput(batch_execute_statement_response)
-
-    def delete_item_request(self, delete_item_request):
-        return self.boto3_converter.DeleteItemInput(delete_item_request)
+        raise NotImplementedError("batch_execute_statement response handling is not implemented")
 
     def delete_item_response(self, delete_item_response):
         return self.boto3_converter.DeleteItemOutput(delete_item_response)
@@ -121,10 +129,10 @@ def execute_statement_request(self, execute_statement_request):
         return self.boto3_converter.ExecuteStatementInput(execute_statement_request)
 
     def execute_statement_response(self, execute_statement_response):
-        return self.boto3_converter.ExecuteStatementOutput(execute_statement_response)
+        raise NotImplementedError("execute_statement response handling is not implemented")
 
     def execute_transaction_request(self, execute_transaction_request):
         return self.boto3_converter.ExecuteTransactionInput(execute_transaction_request)
 
     def execute_transaction_response(self, execute_transaction_response):
-        return self.boto3_converter.ExecuteTransactionOutput(execute_transaction_response)
+        raise NotImplementedError("execute_transaction response handling is not implemented")

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

@@ -161,7 +161,25 @@ def put_item_response(self, put_item_response):
         return self.boto3_converter.PutItemOutput(put_item_response)
 
     def update_item_response(self, update_item_response):
-        return self.boto3_converter.UpdateItemOutput(update_item_response)
+        raise NotImplementedError("update_item response handling is not implemented")
+
+    def batch_execute_statement_request(self, batch_execute_statement_request):
+        return self.boto3_converter.BatchExecuteStatementInput(batch_execute_statement_request)
+
+    def batch_execute_statement_response(self, batch_execute_statement_response):
+        raise NotImplementedError("batch_execute_statement response handling is not implemented")
 
     def delete_item_response(self, delete_item_response):
         return self.boto3_converter.DeleteItemOutput(delete_item_response)
+
+    def execute_statement_request(self, execute_statement_request):
+        return self.boto3_converter.ExecuteStatementInput(execute_statement_request)
+
+    def execute_statement_response(self, execute_statement_response):
+        raise NotImplementedError("execute_statement response handling is not implemented")
+
+    def execute_transaction_request(self, execute_transaction_request):
+        return self.boto3_converter.ExecuteTransactionInput(execute_transaction_request)
+
+    def execute_transaction_response(self, execute_transaction_response):
+        raise NotImplementedError("execute_transaction response handling is not implemented")

DynamoDbEncryption/runtimes/python/test/integ/encrypted/test_client.py

@@ -30,6 +30,14 @@
     basic_batch_write_item_delete_request_dict,
     basic_batch_write_item_put_request_ddb,
     basic_batch_write_item_put_request_dict,
+    basic_batch_execute_statement_request_ddb,
+    basic_batch_execute_statement_request_dict,
+    basic_execute_statement_request_ddb,
+    basic_execute_statement_request_dict,
+    basic_execute_transaction_request_ddb,
+    basic_execute_transaction_request_dict,
+    basic_update_item_request_ddb,
+    basic_update_item_request_dict,
     basic_delete_item_request_ddb,
     basic_delete_item_request_dict,
     basic_get_item_request_ddb,
@@ -375,6 +383,12 @@ def test_GIVEN_valid_transact_write_and_get_requests_WHEN_transact_write_and_get
     assert transact_write_delete_response["ResponseMetadata"]["HTTPStatusCode"] == 200
 
 
+@pytest.fixture
+def update_item_request(expect_standard_dictionaries, test_item):
+    if expect_standard_dictionaries:
+        return basic_update_item_request_dict(test_item)
+    return basic_update_item_request_ddb(test_item)
+
 def test_WHEN_update_item_THEN_raises_DynamoDbEncryptionTransformsException():
     """Test that update_item raises DynamoDbEncryptionTransformsException."""
     # Given: Encrypted client and update item parameters
@@ -388,6 +402,12 @@ def test_WHEN_update_item_THEN_raises_DynamoDbEncryptionTransformsException():
             ExpressionAttributeValues={":val": {"S": "new value"}},
         )
 
+@pytest.fixture
+def execute_statement_request(expect_standard_dictionaries, test_item):
+    if expect_standard_dictionaries:
+        return basic_execute_statement_request_dict(test_item)
+    return basic_execute_statement_request_ddb(test_item)
+
 
 def test_WHEN_execute_statement_THEN_raises_DynamoDbEncryptionTransformsException():
     """Test that execute_statement raises DynamoDbEncryptionTransformsException."""
@@ -400,6 +420,13 @@ def test_WHEN_execute_statement_THEN_raises_DynamoDbEncryptionTransformsExceptio
         )
 
 
+@pytest.fixture
+def execute_transaction_request(expect_standard_dictionaries, test_item):
+    if expect_standard_dictionaries:
+        return basic_execute_transaction_request_dict(test_item)
+    return basic_execute_transaction_request_ddb(test_item)
+
+
 def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsException():
     """Test that execute_transaction raises DynamoDbEncryptionTransformsException."""
     # Given: Encrypted client and update item parameters
@@ -415,6 +442,12 @@ def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsExcept
             ],
         )
 
+@pytest.fixture
+def batch_execute_statement_request(expect_standard_dictionaries, test_item):
+    if expect_standard_dictionaries:
+        return basic_batch_execute_statement_request_dict(test_item)
+    return basic_batch_execute_statement_request_ddb(test_item)
+
 
 def test_WHEN_batch_execute_statement_THEN_raises_DynamoDbEncryptionTransformsException():
     """Test that batch_execute_statement raises DynamoDbEncryptionTransformsException."""

DynamoDbEncryption/runtimes/python/test/requests.py

@@ -60,6 +60,31 @@ def base_transact_get_item_request(keys):
     }
 
 
+def base_update_item_request(item):
+    """Base structure for update_item requests."""
+    return {"Key": {"partition_key": item["partition_key"], "sort_key": item["sort_key"]}, "UpdateExpression": "SET attribute1 = :val", "ExpressionAttributeValues": {":val": item["attribute1"]}}
+
+
+def base_execute_statement_request():
+    """Base structure for execute_statement requests."""
+    return {"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
+
+
+def base_execute_transaction_request():
+    """Base structure for execute_transaction requests."""
+    return {"TransactStatements": [{"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}]}
+
+
+def base_batch_execute_statement_request():
+    """Base structure for batch_execute_statement requests."""
+    return {"Statements": [{"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}]}
+
+
+def base_execute_transaction_request():
+    """Base structure for execute_transaction requests."""
+    return {"TransactStatements": [{"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}]}
+
+
 # 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.
@@ -300,7 +325,6 @@ def basic_transact_write_item_condition_check_request_ddb(keys):
     ]
     return basic_transact_write_item_request_ddb(actions_with_keys)
 
-
 def basic_transact_get_item_request_ddb(keys):
     """Get a transact_get_item request in DDB format for any keys."""
     return base_transact_get_item_request(keys)
@@ -323,6 +347,31 @@ def basic_scan_paginator_request(item):
         "ExpressionAttributeValues": {":pk": item["partition_key"], ":sk": item["sort_key"]},
     }
 
+def basic_update_item_request_ddb(item):
+    """Get an update_item request in DDB format for any item."""
+    base = base_update_item_request(item)
+    return {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, **base}
+
+def basic_execute_statement_request_ddb():
+    """Get an execute_statement request in DDB format."""
+    base = base_execute_statement_request()
+    return base
+
+def basic_execute_transaction_request_ddb():
+    """Get an execute_transaction request in DDB format."""
+    base = base_execute_transaction_request()
+    return base
+
+def basic_batch_execute_statement_request_ddb():
+    """Get a batch_execute_statement request in DDB format."""
+    base = base_batch_execute_statement_request()
+    return base
+
+def basic_delete_item_request_ddb(item):
+    """Get a delete_item request in DDB format for any item."""
+    base = base_delete_item_request(item)
+    return {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, **base}
+
 
 # Dict format request functions
 
@@ -372,7 +421,6 @@ def exhaustive_get_item_request_dict(item):
 def basic_query_request_dict(item):
     """Get a query request in dict format for any item."""
     base = base_query_request(item)
-    # Override base KeyConditionExpression to use ConditionExpressions
     return base
 
 
@@ -465,3 +513,23 @@ def basic_transact_write_item_condition_check_request_dict(keys):
 def basic_transact_get_item_request_dict(keys):
     """Get a transact_get_item request in dict format for any keys."""
     return base_transact_get_item_request(keys)
+
+def basic_update_item_request_dict(item):
+    """Get an update_item request in DDB format for any item."""
+    base = base_update_item_request(item)
+    return base
+
+def basic_execute_statement_request_dict():
+    """Get an execute_statement request in DDB format."""
+    base = base_execute_statement_request()
+    return base
+
+def basic_execute_transaction_request_dict():
+    """Get an execute_transaction request in DDB format."""
+    base = base_execute_transaction_request()
+    return base
+
+def basic_batch_execute_statement_request_dict():
+    """Get a batch_execute_statement request in DDB format."""
+    base = base_batch_execute_statement_request()
+    return base

DynamoDbEncryption/runtimes/python/test/responses.py

@@ -155,3 +155,12 @@ def basic_transact_write_items_response(items):
 def basic_transact_get_items_response(items):
     """Get a transact_get_items response in resource (ddb) format for any items."""
     return {"Responses": [{"Item": item} for item in items]}
+
+def basic_update_item_response(item):
+    """Get an update_item response in resource (ddb) format for any item."""
+    return {"Attributes": item}
+
+
+def basic_delete_item_response(item):
+    """Get a delete_item response in resource (ddb) format for any item."""
+    return {"Attributes": item}