sync

Author: Lucas McDonald

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

@@ -28,8 +28,10 @@ def condition_handler(self, expression_key, request):
         condition = request[expression_key]
 
         # This conversion in client_to_resource does not update ExpressionAttributeNames or ExpressionAttributeValues.
-        # However, resource_to_client condition_handler may add new ExpressionAttributeNames and ExpressionAttributeValues.
-        # Smithy-generated code expects condition_handlers to return ExpressionAttributeNames and ExpressionAttributeValues,
+        # However, resource_to_client condition_handler may add new ExpressionAttributeNames and
+        # ExpressionAttributeValues.
+        # Smithy-generated code expects condition_handlers to return ExpressionAttributeNames and
+        # ExpressionAttributeValues,
         # expecting empty dicts if there are none.
         try:
             names = request["ExpressionAttributeNames"]
@@ -88,7 +90,7 @@ def delete_item_request(self, delete_item_request):
         if self.delete_table_name:
             del out["TableName"]
         return out
-    
+
     def delete_item_response(self, delete_item_response):
         return self.boto3_converter.DeleteItemOutput(delete_item_response)
 
@@ -98,7 +100,7 @@ def update_item_request(self, update_item_request):
         if self.delete_table_name:
             del out["TableName"]
         return out
-    
+
     def update_item_response(self, update_item_response):
         return self.boto3_converter.UpdateItemOutput(update_item_response)
 

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

@@ -3,8 +3,8 @@
 from aws_cryptography_internal_dynamodb.smithygenerated.com_amazonaws_dynamodb.boto3_conversions import (
     InternalBoto3DynamoDBFormatConverter,
 )
-from boto3.dynamodb.types import TypeSerializer
 from boto3.dynamodb.conditions import ConditionExpressionBuilder
+from boto3.dynamodb.types import TypeSerializer
 
 
 class ResourceShapeToClientShapeConverter:
@@ -43,10 +43,12 @@ def condition_handler(self, expression_key, request):
             hasattr(condition_expression, "__module__")
             and condition_expression.__module__ == "boto3.dynamodb.conditions"
         ):
-            built_condition_expression = self.expression_builder.build_expression(
-                condition_expression
+            built_condition_expression = self.expression_builder.build_expression(condition_expression)
+            return (
+                built_condition_expression.condition_expression,
+                built_condition_expression.attribute_name_placeholders,
+                built_condition_expression.attribute_value_placeholders,
             )
-            return built_condition_expression.condition_expression, built_condition_expression.attribute_name_placeholders, built_condition_expression.attribute_value_placeholders
         else:
             return condition_expression, existing_expression_attribute_names, existing_expression_attribute_values
 

DynamoDbEncryption/runtimes/python/test/items.py

@@ -1,3 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 from decimal import Decimal
 
 simple_item_ddb = {

DynamoDbEncryption/runtimes/python/test/requests.py

@@ -1,3 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Request constants for DynamoDB operations used for testing."""
 
 from boto3.dynamodb.conditions import Attr, Key
@@ -140,7 +142,7 @@ def basic_batch_execute_statement_request_plaintext_table():
 
 # No exhaustive requests are intended to be able to be used as real requests.
 # Some parameters conflict with each other when sent to DynamoDB.
-# These are only intended to test the conversion of the request from client to resource format.
+# These are only intended to test the conversion of the structure from client to resource format.
 
 
 def base_exhaustive_put_item_request(item):

DynamoDbEncryption/runtimes/python/test/responses.py

@@ -1,3 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 from test.integ.encrypted.test_resource import INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME
 
 

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

@@ -3,7 +3,7 @@
 import pytest
 
 from aws_dbesdk_dynamodb.internal.client_to_resource import ClientShapeToResourceShapeConverter
-from aws_dbesdk_dynamodb.internal.condition_expression_builder import InternalDBESDKDynamoDBConditionExpressionBuilder
+from boto3.dynamodb.conditions import ConditionExpressionBuilder
 
 from ...items import (
     complex_item_ddb,
@@ -261,7 +261,7 @@ def get_string_for_key_condition_expression(
 ):
     """Get the string for the key condition expression."""
     if not isinstance(key_condition_expression, str):
-        built_expression = InternalDBESDKDynamoDBConditionExpressionBuilder().build_expression(
+        built_expression = ConditionExpressionBuilder().build_expression(
             key_condition_expression, expression_attribute_names, expression_attribute_values
         )
         key_condition_expression = built_expression.condition_expression

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

@@ -1,8 +1,8 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 import pytest
-
 from boto3.dynamodb.conditions import ConditionExpressionBuilder
+
 from aws_dbesdk_dynamodb.internal.resource_to_client import ResourceShapeToClientShapeConverter
 
 from ...constants import INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME