m

Author: Lucas McDonald

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

@@ -70,15 +70,15 @@ def scan_request(self, 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 
+        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.

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

@@ -163,23 +163,5 @@ def put_item_response(self, put_item_response):
     def update_item_response(self, 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

@@ -24,22 +24,20 @@
     simple_key_dict,
 )
 from ...requests import (
+    basic_batch_execute_statement_request_ddb,
+    basic_batch_execute_statement_request_dict,
     basic_batch_get_item_request_ddb,
     basic_batch_get_item_request_dict,
     basic_batch_write_item_delete_request_ddb,
     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_delete_item_request_ddb,
+    basic_delete_item_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,
     basic_get_item_request_dict,
     basic_put_item_request_ddb,
@@ -54,6 +52,8 @@
     basic_transact_write_item_delete_request_dict,
     basic_transact_write_item_put_request_ddb,
     basic_transact_write_item_put_request_dict,
+    basic_update_item_request_ddb,
+    basic_update_item_request_dict,
 )
 from . import sort_dynamodb_json_lists
 
@@ -389,6 +389,7 @@ def update_item_request(expect_standard_dictionaries, test_item):
         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
@@ -402,6 +403,7 @@ 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:
@@ -442,6 +444,7 @@ def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsExcept
             ],
         )
 
+
 @pytest.fixture
 def batch_execute_statement_request(expect_standard_dictionaries, test_item):
     if expect_standard_dictionaries:

DynamoDbEncryption/runtimes/python/test/requests.py

@@ -62,7 +62,11 @@ 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"]}}
+    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():
@@ -80,11 +84,6 @@ def base_batch_execute_statement_request():
     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.
@@ -325,6 +324,7 @@ 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)
@@ -347,32 +347,30 @@ 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
 
 
@@ -514,21 +512,25 @@ 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()

DynamoDbEncryption/runtimes/python/test/responses.py

@@ -156,6 +156,7 @@ 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}

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

@@ -14,26 +14,24 @@
     simple_key_dict,
 )
 from ...requests import (
+    basic_batch_execute_statement_request_ddb,
+    basic_batch_execute_statement_request_dict,
     basic_batch_get_item_request_ddb,
     basic_batch_get_item_request_dict,
     basic_batch_write_item_delete_request_ddb,
     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_delete_item_request_ddb,
+    basic_delete_item_request_dict,
     basic_execute_statement_request_ddb,
     basic_execute_statement_request_dict,
     basic_execute_transaction_request_ddb,
     basic_execute_transaction_request_dict,
-    basic_delete_item_request_ddb,
-    basic_delete_item_request_dict,
     basic_get_item_request_ddb,
     basic_get_item_request_dict,
     basic_put_item_request_ddb,
     basic_put_item_request_dict,
-    basic_update_item_request_ddb,
-    basic_update_item_request_dict,
     basic_query_request_ddb,
     basic_query_request_dict,
     basic_scan_request_ddb,
@@ -46,6 +44,8 @@
     basic_transact_write_item_delete_request_dict,
     basic_transact_write_item_put_request_ddb,
     basic_transact_write_item_put_request_dict,
+    basic_update_item_request_ddb,
+    basic_update_item_request_dict,
     exhaustive_get_item_request_ddb,
     exhaustive_get_item_request_dict,
     exhaustive_put_item_request_ddb,
@@ -556,6 +556,7 @@ def test_GIVEN_test_transact_get_items_response_WHEN_client_to_resource_THEN_ret
 def test_update_item_request_ddb():
     return basic_update_item_request_ddb
 
+
 @pytest.fixture
 def test_update_item_request_dict():
     return basic_update_item_request_dict
@@ -571,6 +572,7 @@ def test_GIVEN_test_update_item_request_WHEN_client_to_resource_THEN_returns_dic
     # Then: Returns dict value
     assert dict_item == test_update_item_request_dict(test_dict_item)
 
+
 def test_GIVEN_test_update_item_response_WHEN_client_to_resource_THEN_raises_NotImplementedError():
     # Given: Update item response
     response = {"Some": "Response"}
@@ -579,14 +581,17 @@ def test_GIVEN_test_update_item_response_WHEN_client_to_resource_THEN_raises_Not
         # When: Converting to resource format
         client_to_resource_converter.update_item_response(response)
 
+
 @pytest.fixture
 def test_execute_statement_request_ddb():
     return basic_execute_statement_request_ddb
 
+
 @pytest.fixture
 def test_execute_statement_request_dict():
     return basic_execute_statement_request_dict
 
+
 def test_GIVEN_test_execute_statement_request_WHEN_client_to_resource_THEN_returns_dict_value(
     test_execute_statement_request_ddb, test_execute_statement_request_dict, test_ddb_item, test_dict_item
 ):
@@ -606,14 +611,17 @@ def test_GIVEN_test_execute_statement_response_WHEN_client_to_resource_THEN_rais
         # When: Converting to resource format
         client_to_resource_converter.execute_statement_response(response)
 
+
 @pytest.fixture
 def test_execute_transaction_request_ddb():
     return basic_execute_transaction_request_ddb
 
+
 @pytest.fixture
 def test_execute_transaction_request_dict():
     return basic_execute_transaction_request_dict
 
+
 def test_GIVEN_test_execute_transaction_request_WHEN_client_to_resource_THEN_returns_dict_value(
     test_execute_transaction_request_ddb, test_execute_transaction_request_dict, test_ddb_item, test_dict_item
 ):
@@ -624,6 +632,7 @@ def test_GIVEN_test_execute_transaction_request_WHEN_client_to_resource_THEN_ret
     # Then: Returns dict value
     assert dict_item == test_execute_transaction_request_dict()
 
+
 def test_GIVEN_test_execute_transaction_response_WHEN_client_to_resource_THEN_raises_NotImplementedError():
     # Given: Execute transaction response
     response = {"Some": "Response"}
@@ -632,14 +641,17 @@ def test_GIVEN_test_execute_transaction_response_WHEN_client_to_resource_THEN_ra
         # When: Converting to resource format
         client_to_resource_converter.execute_transaction_response(response)
 
+
 @pytest.fixture
 def test_batch_execute_statement_request_ddb():
     return basic_batch_execute_statement_request_ddb
 
+
 @pytest.fixture
 def test_batch_execute_statement_request_dict():
     return basic_batch_execute_statement_request_dict
 
+
 def test_GIVEN_test_batch_execute_statement_request_WHEN_client_to_resource_THEN_returns_dict_value(
     test_batch_execute_statement_request_ddb, test_batch_execute_statement_request_dict, test_ddb_item, test_dict_item
 ):
@@ -664,10 +676,12 @@ def test_GIVEN_test_batch_execute_statement_response_WHEN_client_to_resource_THE
 def test_delete_item_request_ddb():
     return basic_delete_item_request_ddb
 
+
 @pytest.fixture
 def test_delete_item_request_dict():
     return basic_delete_item_request_dict
 
+
 def test_GIVEN_test_delete_item_request_WHEN_client_to_resource_THEN_returns_dict_value(
     test_delete_item_request_ddb, test_delete_item_request_dict, test_ddb_key, test_dict_key
 ):
@@ -683,6 +697,7 @@ def test_GIVEN_test_delete_item_request_WHEN_client_to_resource_THEN_returns_dic
 def test_delete_item_response():
     return basic_delete_item_response
 
+
 def test_GIVEN_test_delete_item_response_WHEN_client_to_resource_THEN_returns_dict_value(
     test_delete_item_response, test_ddb_item, test_dict_item
 ):