m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/__init__.py

@@ -2,9 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 """Initialization code for AWS DBESDK for DynamoDB."""
 
-# Initialize generated Dafny, then initialize externs
-# Disable sorting imports; this order initializes code in the required order
-# (generated Dafny, then externs)
+# Disable sorting imports; this order initializes code in the required order: generated Dafny, then externs.
 # ruff: noqa: I001, F401
 from .internaldafny.generated import module_
 from .internaldafny import extern
@@ -15,9 +13,10 @@
 boto3 deserializes strings to Decimals according to its DYNAMODB_CONTEXT:
 https://github.com/boto/boto3/blob/develop/boto3/dynamodb/types.py#L37-L42
 
-boto3 is configured to raise an exception if the deserialization is "Rounded": (`traps: [.. Rounded]`)
-https://docs.python.org/3/library/decimal.html#decimal.Rounded
-"Rounded" means some digits were discarded.
+From the link above, boto3 is configured to raise an exception
+if the deserialization is "Rounded": (`traps: [.. Rounded]`).
+Documentation: https://docs.python.org/3/library/decimal.html#decimal.Rounded
+From the link above, "Rounded" means some digits were discarded.
 However, those digits may have been 0, and no information is lost.
 
 boto3 is also configured to raise an exception if the deserialization is "Inexact":
@@ -36,7 +35,11 @@
 import boto3.dynamodb.types
 
 old_context = boto3.dynamodb.types.DYNAMODB_CONTEXT
-old_traps = old_context.__getattribute__("traps")
+try:
+    old_traps = old_context.__getattribute__("traps")
+except AttributeError:
+    raise AttributeError("boto3.dynamodb.types.DYNAMODB_CONTEXT must have a 'traps' attribute to use DBESDK for DynamoDB.")
+
 # traps structure: {k (trap class) : v (True if trap should raise Exception; False otherwise)}
 old_traps[Rounded] = False
 boto3.dynamodb.types.DYNAMODB_CONTEXT.__setattr__("traps", old_traps)

Examples/runtimes/python/DynamoDBEncryption/src/searchable_encryption/complex_example/client/query_requests.py

@@ -142,9 +142,8 @@ def run_query_3(ddb_client, table_name):
     # Check known values in the response
     found_known_value_item = False
     for item in response["Items"]:
-        if item["partition_key"] == "reservation1":
-            found_known_value_item = True
         if item["partition_key"]["S"] == "reservation1":
+            found_known_value_item = True
             assert item["Subject"]["S"] == "Scan beacons"
             assert item["Location"]["M"]["Building"]["S"] == "SEA33"
             assert {"S": "[email protected]"} in item["Attendees"]["L"]

TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBResource.py

@@ -151,7 +151,7 @@ def CreateInterceptedDDBClient(dafny_encryption_config):
             table_config_names = list(native_encryption_config.table_encryption_configs.keys())
             if len(table_config_names) > 1:
                 raise ValueError("TODO more than 1 table; need EncryptedTablesManager")
-            # table = boto3.resource('dynamodb').Table(table_config_names[0])
+            # For TestVectors, use local DynamoDB endpoint
             resource = boto3.resource('dynamodb', endpoint_url="http://localhost:8000")
             encrypted_resource = EncryptedResource(resource = resource, encryption_config = native_encryption_config)
             wrapped_encrypted_resource = DynamoDBClientWrapperForDynamoDBResource(resource = encrypted_resource, client = boto3_client)

TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBTable.py

@@ -200,8 +200,9 @@ def CreateInterceptedDDBClient(dafny_encryption_config):
             boto3_client = WaitingLocalDynamoClient()
             table_config_names = list(native_encryption_config.table_encryption_configs.keys())
             if len(table_config_names) > 1:
-                # If needed, this could be supported by setting up an EncryptedTablesManager
+                # If needed, >1 table could be supported by setting up an EncryptedTablesManager
                 raise ValueError(">1 table not supported")
+            # For TestVectors, use local DynamoDB endpoint
             table = boto3.resource('dynamodb', endpoint_url="http://localhost:8000").Table(table_config_names[0])
             encrypted_table = EncryptedTable(table = table, encryption_config = native_encryption_config)
             wrapped_encrypted_table = DynamoDBClientWrapperForDynamoDBTable(table = encrypted_table, client = boto3_client)