m

Author: Lucas McDonald

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

@@ -114,8 +114,7 @@ def batch_write_item_response(self, batch_write_item_response):
         return self.boto3_converter.BatchWriteItemOutput(batch_write_item_response)
 
     def update_item_response(self, update_item_response):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("update_item response handling is not implemented")
+        return self.boto3_converter.UpdateItemOutput(update_item_response)
 
     def batch_execute_statement_request(self, batch_execute_statement_request):
         return self.boto3_converter.BatchExecuteStatementInput(batch_execute_statement_request)

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

@@ -164,8 +164,7 @@ def put_item_response(self, put_item_response):
         return self.boto3_converter.PutItemOutput(put_item_response)
 
     def update_item_response(self, update_item_response):
-        # DBESDK transformers will raise an exception before this is called
-        raise NotImplementedError("update_item response handling is not implemented")
+        return self.boto3_converter.UpdateItemOutput(update_item_response)
 
     def delete_item_response(self, delete_item_response):
         return self.boto3_converter.DeleteItemOutput(delete_item_response)

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

@@ -46,8 +46,10 @@
     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,
+    basic_update_item_request_ddb_signed_attribute,
+    basic_update_item_request_ddb_unsigned_attribute,
+    basic_update_item_request_dict_signed_attribute,
+    basic_update_item_request_dict_unsigned_attribute,
     basic_execute_statement_request,
     basic_execute_transaction_request,
     basic_batch_execute_statement_request,
@@ -379,16 +381,31 @@ def test_GIVEN_valid_transact_write_and_get_requests_WHEN_transact_write_and_get
     # Then: transact_write_item delete succeeds
     assert transact_write_delete_response["ResponseMetadata"]["HTTPStatusCode"] == 200
 
+@pytest.fixture
+def update_item_request_unsigned_attribute(expect_standard_dictionaries, test_item):
+    if expect_standard_dictionaries:
+        return {**basic_update_item_request_dict_unsigned_attribute(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
+    return basic_update_item_request_ddb_unsigned_attribute(test_item)
+
+
+def test_WHEN_update_item_with_unsigned_attribute_THEN_passes(
+    client, update_item_request_unsigned_attribute, encrypted, get_item_request
+):
+    # Given: Valid update_item request
+    # When: update_item
+    update_response = client.update_item(**update_item_request_unsigned_attribute)
+    # Then: update_item succeeds
+    assert update_response["ResponseMetadata"]["HTTPStatusCode"] == 200
 
 @pytest.fixture
-def update_item_request(expect_standard_dictionaries, test_item):
+def update_item_request_signed_attribute(expect_standard_dictionaries, test_item):
     if expect_standard_dictionaries:
-        return {**basic_update_item_request_dict(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
-    return basic_update_item_request_ddb(test_item)
+        return {**basic_update_item_request_dict_signed_attribute(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
+    return basic_update_item_request_ddb_signed_attribute(test_item)
 
 
-def test_WHEN_update_item_THEN_raises_DynamoDbEncryptionTransformsException(
-    client, update_item_request, encrypted,
+def test_WHEN_update_item_with_signed_attribute_THEN_raises_DynamoDbEncryptionTransformsException(
+    client, update_item_request_signed_attribute, encrypted,
 ):
     """Test that update_item raises DynamoDbEncryptionTransformsException."""
     if not encrypted:
@@ -399,7 +416,7 @@ def test_WHEN_update_item_THEN_raises_DynamoDbEncryptionTransformsException(
     with pytest.raises(DynamoDbEncryptionTransformsException):
         # When: Calling update_item
         client.update_item(
-            **update_item_request
+            **update_item_request_signed_attribute
         )
 
 

DynamoDbEncryption/runtimes/python/test/requests.py

@@ -60,7 +60,7 @@ def base_transact_get_item_request(keys):
     }
 
 
-def base_update_item_request(item):
+def base_update_item_request_signed_attribute(item):
     """Base structure for update_item requests."""
     return {
         "Key": {"partition_key": item["partition_key"], "sort_key": item["sort_key"]},
@@ -69,6 +69,15 @@ def base_update_item_request(item):
     }
 
 
+def base_update_item_request_unsigned_attribute(item):
+    """Base structure for update_item requests."""
+    return {
+        "Key": {"partition_key": item["partition_key"], "sort_key": item["sort_key"]},
+        "UpdateExpression": "SET #attr3 = :val",
+        "ExpressionAttributeValues": {":val": item[":attribute3"]},
+        "ExpressionAttributeNames": {"#attr3": ":attribute3"},
+    }
+
 def basic_execute_statement_request():
     """Base structure for execute_statement requests."""
     return {"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
@@ -348,9 +357,15 @@ def basic_scan_paginator_request(item):
     }
 
 
-def basic_update_item_request_ddb(item):
+def basic_update_item_request_ddb_signed_attribute(item):
+    """Get an update_item request in DDB format for any item."""
+    base = base_update_item_request_signed_attribute(item)
+    return {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, **base}
+
+
+def basic_update_item_request_ddb_unsigned_attribute(item):
     """Get an update_item request in DDB format for any item."""
-    base = base_update_item_request(item)
+    base = base_update_item_request_unsigned_attribute(item)
     return {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, **base}
 
 
@@ -496,7 +511,14 @@ def basic_transact_get_item_request_dict(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)
+def basic_update_item_request_dict_signed_attribute(item):
+    """Get an update_item request in dict format for any item."""
+    base = base_update_item_request_signed_attribute(item)
     return base
+
+
+def basic_update_item_request_dict_unsigned_attribute(item):
+    """Get an update_item request in dict format for any item."""
+    base = base_update_item_request_unsigned_attribute(item)
+    return base
+