m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/docs/index.rst

@@ -14,12 +14,10 @@ Modules
     aws_dbesdk_dynamodb.encrypted.item
     aws_dbesdk_dynamodb.encrypted.resource
     aws_dbesdk_dynamodb.encrypted.paginator
-    aws_dbesdk_dynamodb.models
-    aws_dbesdk_dynamodb.models.dynamodb
-    aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.models
-    aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_structuredencryption.models
-    aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.models
-    aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.config
+    aws_dbesdk_dynamodb.structures
+    aws_dbesdk_dynamodb.structures.dynamodb
+    aws_dbesdk_dynamodb.structures.structured_encryption
+    aws_dbesdk_dynamodb.structures.item_encryptor
 
 
 The content below applies to all languages of the AWS DBESDK for DynamoDB.

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/models/dynamodb.py

@@ -0,0 +1,18 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+
+def sort_dynamodb_json_lists(obj):
+    """
+    Utility that recursively sorts all lists in a DynamoDB JSON-like structure.
+    DynamoDB JSON uses lists to represent sets, so strict equality can fail.
+    Sort lists to ensure consistent ordering when comparing expected and actual items.
+    """
+    if isinstance(obj, dict):
+        return {k: sort_dynamodb_json_lists(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        try:
+            return sorted(obj)  # Sort lists for consistent comparison
+        except TypeError:
+            return obj  # Not all lists are sortable; ex. complex_item_ddb's "list" attribute
+    return obj

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/models/structured_encryption.py

@@ -7,6 +7,8 @@
 from aws_dbesdk_dynamodb.encrypted.client import EncryptedClient
 from aws_dbesdk_dynamodb.encrypted.paginator import EncryptedPaginator
 
+from . import sort_dynamodb_json_lists
+
 from ...constants import (
     INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
     INTEG_TEST_DEFAULT_TABLE_CONFIGS,
@@ -153,23 +155,6 @@ def get_item_request(expect_standard_dictionaries, test_item):
         return {**basic_get_item_request_dict(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
     return basic_get_item_request_ddb(test_item)
 
-
-def sort_dynamodb_json_lists(obj):
-    """
-    Utility that recursively sorts all lists in a DynamoDB JSON-like structure.
-    DynamoDB JSON uses lists to represent sets, so strict equality can fail.
-    Sort lists to ensure consistent ordering when comparing expected and actual items.
-    """
-    if isinstance(obj, dict):
-        return {k: sort_dynamodb_json_lists(v) for k, v in obj.items()}
-    elif isinstance(obj, list):
-        try:
-            return sorted(obj)  # Sort lists for consistent comparison
-        except TypeError:
-            return obj  # Not all lists are sortable; ex. complex_item_ddb's "list" attribute
-    return obj
-
-
 def test_GIVEN_valid_put_and_get_requests_WHEN_put_and_get_THEN_round_trip_passes(
     client, put_item_request, get_item_request
 ):