m

Author: Lucas McDonald

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

@@ -120,8 +120,7 @@ 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):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("batch_execute_statement response handling is not implemented")
+        return self.boto3_converter.BatchExecuteStatementOutput(batch_execute_statement_response)
 
     def delete_item_response(self, delete_item_response):
         return self.boto3_converter.DeleteItemOutput(delete_item_response)
@@ -130,12 +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):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("execute_statement response handling is not implemented")
+        return self.boto3_converter.ExecuteStatementOutput(execute_statement_response)
 
     def execute_transaction_request(self, execute_transaction_request):
         return self.boto3_converter.ExecuteTransactionInput(execute_transaction_request)
 
     def execute_transaction_response(self, execute_transaction_response):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("execute_transaction response handling is not implemented")
+        return self.boto3_converter.ExecuteTransactionOutput(execute_transaction_response)

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

@@ -134,22 +134,19 @@ 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):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("batch_execute_statement response handling is not implemented")
+        return self.boto3_converter.BatchExecuteStatementOutput(batch_execute_statement_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):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("execute_statement response handling is not implemented")
+        return self.boto3_converter.ExecuteStatementOutput(execute_statement_response)
 
     def execute_transaction_request(self, execute_transaction_request):
         return self.boto3_converter.ExecuteTransactionInput(execute_transaction_request)
 
     def execute_transaction_response(self, execute_transaction_response):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("execute_transaction response handling is not implemented")
+        return self.boto3_converter.ExecuteTransactionOutput(execute_transaction_response)
 
     def scan_response(self, scan_response):
         return self.boto3_converter.ScanOutput(scan_response)

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

@@ -441,10 +441,10 @@ def execute_uses_encrypted_table(request):
 
 
 @pytest.fixture
-def execute_statement_request(execute_uses_encrypted_table):
+def execute_statement_request(execute_uses_encrypted_table, test_item):
     if execute_uses_encrypted_table:
-        return basic_execute_statement_request_encrypted_table()
-    return basic_execute_statement_request_plaintext_table()
+        return basic_execute_statement_request_encrypted_table(test_item)
+    return basic_execute_statement_request_plaintext_table(test_item)
 
 
 def test_WHEN_execute_statement_for_encrypted_table_THEN_raises_DynamoDbEncryptionTransformsException(

DynamoDbEncryption/runtimes/python/test/requests.py

@@ -82,14 +82,22 @@ def base_update_item_request_unsigned_attribute(item):
     }
 
 
-def basic_execute_statement_request_encrypted_table():
+def basic_execute_statement_request_encrypted_table(item):
     """Base structure for execute_statement requests for an encrypted table."""
-    return {"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
+    return {
+        "Statement": f"""SELECT * FROM {INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
+        WHERE partition_key=? AND sort_key=?""",
+        "Parameters": [item["partition_key"], item["sort_key"]],
+    }
 
 
-def basic_execute_statement_request_plaintext_table():
+def basic_execute_statement_request_plaintext_table(item):
     """Base structure for execute_statement requests for a plaintext table."""
-    return {"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME_PLAINTEXT}
+    return {
+        "Statement": f"""SELECT * FROM {INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME_PLAINTEXT}
+        WHERE partition_key=? AND sort_key=?""",
+        "Parameters": [item["partition_key"], item["sort_key"]],
+    }
 
 
 def basic_execute_transaction_request_encrypted_table(item):

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

@@ -603,20 +603,21 @@ def test_GIVEN_test_execute_statement_request_WHEN_client_to_resource_THEN_retur
     test_execute_statement_request, test_ddb_item, test_dict_item
 ):
     # Given: Execute statement request
-    request = test_execute_statement_request()
+    request = test_execute_statement_request(test_ddb_item)
     # When: Converting to resource format
     dict_item = client_to_resource_converter.execute_statement_request(request)
     # Then: Returns dict value (here, request is not modified)
-    assert dict_item == test_execute_statement_request()
+    assert dict_item == test_execute_statement_request(test_dict_item)
 
 
 def test_GIVEN_test_execute_statement_response_WHEN_client_to_resource_THEN_raises_NotImplementedError():
     # Given: Execute statement response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        client_to_resource_converter.execute_statement_response(response)
+    # TODO: this
+    ddb_response = {}
+    # When: Converting to resource format
+    resource_response = client_to_resource_converter.execute_statement_response(ddb_response)
+    # Then: Returns dict value
+    assert resource_response == {}
 
 
 @pytest.fixture
@@ -635,13 +636,14 @@ def test_GIVEN_test_execute_transaction_request_WHEN_client_to_resource_THEN_ret
     assert dict_item == test_execute_transaction_request(test_dict_item)
 
 
-def test_GIVEN_test_execute_transaction_response_WHEN_client_to_resource_THEN_raises_NotImplementedError():
+def test_GIVEN_test_execute_transaction_response_WHEN_client_to_resource_THEN_returns_dict_value():
     # Given: Execute transaction response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        client_to_resource_converter.execute_transaction_response(response)
+    # TODO: this
+    ddb_response = {}
+    # When: Converting to resource format
+    resource_response = client_to_resource_converter.execute_transaction_response(ddb_response)
+    # Then: Returns dict value
+    assert resource_response == {}
 
 
 @pytest.fixture
@@ -662,11 +664,12 @@ def test_GIVEN_test_batch_execute_statement_request_WHEN_client_to_resource_THEN
 
 def test_GIVEN_test_batch_execute_statement_response_WHEN_client_to_resource_THEN_raises_NotImplementedError():
     # Given: Batch execute statement response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        client_to_resource_converter.batch_execute_statement_response(response)
+    # TODO: this
+    ddb_response = {}
+    # When: Converting to resource format
+    resource_response = client_to_resource_converter.batch_execute_statement_response(ddb_response)
+    # Then: Returns dict value
+    assert resource_response == {}
 
 
 @pytest.fixture

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

@@ -879,20 +879,21 @@ def test_GIVEN_test_execute_statement_request_WHEN_resource_to_client_THEN_retur
     test_execute_statement_request, test_ddb_item, test_dict_item
 ):
     # Given: Execute statement request
-    request = test_execute_statement_request()
+    request = test_execute_statement_request(test_dict_item)
     # When: Converting to resource format
     actual_ddb_request = resource_to_client_converter.execute_statement_request(request)
     # Then: Returns dict value (here, request is not modified)
-    assert actual_ddb_request == test_execute_statement_request()
+    assert actual_ddb_request == test_execute_statement_request(test_ddb_item)
 
 
-def test_GIVEN_execute_statement_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():
+def test_GIVEN_test_execute_statement_response_WHEN_resource_to_client_THEN_returns_dict_value():
     # Given: Execute statement response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        resource_to_client_converter.execute_statement_response(response)
+    # TODO: this
+    dict_response = {}
+    # When: Converting to resource format
+    ddb_response = resource_to_client_converter.execute_statement_response(dict_response)
+    # Then: Returns dict value
+    assert ddb_response == {}
 
 
 @pytest.fixture
@@ -911,13 +912,14 @@ def test_GIVEN_test_execute_transaction_request_WHEN_resource_to_client_THEN_ret
     assert actual_ddb_request == test_execute_transaction_request(test_ddb_item)
 
 
-def test_GIVEN_execute_transaction_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():
+def test_GIVEN_test_execute_transaction_response_WHEN_resource_to_client_THEN_returns_dict_value():
     # Given: Execute transaction response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        resource_to_client_converter.execute_transaction_response(response)
+    # TODO: this
+    dict_response = {}
+    # When: Converting to resource format
+    ddb_response = resource_to_client_converter.execute_transaction_response(dict_response)
+    # Then: Returns dict value
+    assert ddb_response == {}
 
 
 @pytest.fixture
@@ -926,7 +928,7 @@ def test_batch_execute_statement_request():
 
 
 def test_GIVEN_test_batch_execute_statement_request_WHEN_resource_to_client_THEN_returns_ddb_value(
-    test_batch_execute_statement_request, test_ddb_item, test_dict_item
+    test_batch_execute_statement_request
 ):
     # Given: Batch execute statement request
     request = test_batch_execute_statement_request()
@@ -936,13 +938,14 @@ def test_GIVEN_test_batch_execute_statement_request_WHEN_resource_to_client_THEN
     assert actual_ddb_request == test_batch_execute_statement_request()
 
 
-def test_GIVEN_batch_execute_statement_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():
+def test_GIVEN_test_batch_execute_statement_response_WHEN_resource_to_client_THEN_returns_dict_value():
     # Given: Batch execute statement response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        resource_to_client_converter.batch_execute_statement_response(response)
+    # TODO: this
+    dict_response = {}
+    # When: Converting to resource format
+    ddb_response = resource_to_client_converter.batch_execute_statement_response(dict_response)
+    # Then: Returns dict value
+    assert ddb_response == {}
 
 
 @pytest.fixture