m

Author: Lucas McDonald

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

@@ -7,7 +7,7 @@
 from aws_dbesdk_dynamodb.encrypted.resource import EncryptedResource
 from smithy_dafny_standard_library.internaldafny.generated import Wrappers
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.errors import _smithy_error_to_dafny_error
-from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
+from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingLocalDynamoClient
 from aws_dbesdk_dynamodb.transform import (
     dict_to_ddb,
     ddb_to_dict,
@@ -139,15 +139,15 @@ class default__:
     @staticmethod
     def CreateVanillaDDBClient():
         try:
-            return aws_cryptography_internal_dynamodb.internaldafny.extern.Com_Amazonaws_Dynamodb.default__.DynamoDBClient(WaitingDynamoClient())
+            return aws_cryptography_internal_dynamodb.internaldafny.extern.Com_Amazonaws_Dynamodb.default__.DynamoDBClient(WaitingLocalDynamoClient())
         except Exception as e:
             return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
 
     @staticmethod
     def CreateInterceptedDDBClient(dafny_encryption_config):
         try:
             native_encryption_config = aws_cryptography_dbencryptionsdk_dynamodb_DynamoDbTablesEncryptionConfig(dafny_encryption_config)
-            boto3_client = WaitingDynamoClient()
+            boto3_client = WaitingLocalDynamoClient()
             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")

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

@@ -10,7 +10,7 @@
 from aws_dbesdk_dynamodb.internal.client_to_resource import ClientShapeToResourceShapeConverter
 from smithy_dafny_standard_library.internaldafny.generated import Wrappers
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.errors import _smithy_error_to_dafny_error
-from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
+from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingLocalDynamoClient
 from aws_dbesdk_dynamodb.transform import (
     dict_to_ddb,
     ddb_to_dict,
@@ -442,15 +442,15 @@ class default__:
     @staticmethod
     def CreateVanillaDDBClient():
         try:
-            return aws_cryptography_internal_dynamodb.internaldafny.extern.Com_Amazonaws_Dynamodb.default__.DynamoDBClient(WaitingDynamoClient())
+            return aws_cryptography_internal_dynamodb.internaldafny.extern.Com_Amazonaws_Dynamodb.default__.DynamoDBClient(WaitingLocalDynamoClient())
         except Exception as e:
             return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
 
     @staticmethod
     def CreateInterceptedDDBClient(dafny_encryption_config):
         try:
             native_encryption_config = aws_cryptography_dbencryptionsdk_dynamodb_DynamoDbTablesEncryptionConfig(dafny_encryption_config)
-            boto3_client = WaitingDynamoClient()
+            boto3_client = WaitingLocalDynamoClient()
             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")

TestVectors/runtimes/python/test/client/test_dafny_wrapper.py

@@ -16,7 +16,10 @@
 sys.path.append(test_dir + "/internaldafny/extern")
 sys.path.append(test_dir + "/internaldafny/generated")
 
+# Import extern to use an EncryptedClient as the wrapped DBESDK client.
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.extern.CreateInterceptedDDBClient
+# Import extern to use the ItemEncryptor with DDB JSON-formatted items.
+# (EncryptedClients use DDB JSON-formatted items by default.)
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.extern.CreateWrappedDynamoDbItemEncryptor
 
 def test_dafny():

TestVectors/runtimes/python/test/resource/test_dafny_wrapper.py

@@ -26,22 +26,24 @@
 # Supported operations on Resources that are also supported by DBESDK are:
 # - batch_get_item
 # - batch_write_item
+# https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb/service-resource/index.html
+# 
 # However, Resources can provide Tables. 
 # Unsupported operations on Resources are that are supported by provided Tables are:
 # - put_item
 # - get_item
 # - query
 # - scan
+# https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb/table/index.html#DynamoDB.Table
 # These operations will be tested on EncryptedResources via provided EncryptedTables.
+# 
 # Unsupported operations on both Resources and Tables are that are supported by DBESDK are:
 # - transact_get_items
 # - transact_write_items
-# Remove any tests that call unsupported operations.
+# Remove any tests that call unsupported operations by overriding the test method to do nothing..
 # If more tests that call these operations are added, remove them below.
-# If the list below becomes unmaintainable,
-# or if other languages add clients with unsupported operations,
-# refactor the Dafny code to conditionally call tests
-# based on whether the client supports the operation under test.
+# If the list below becomes unmaintainable, or if other languages add clients with unsupported operations,
+# refactor the Dafny code to conditionally call tests based on whether the client supports the operation under test.
 
 def EmptyTest(*args):
   pass

TestVectors/runtimes/python/test/table/test_dafny_wrapper.py

@@ -20,21 +20,21 @@
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.extern.CreateWrappedDictItemEncryptor
 
 # Remove invalid tests.
-# Supported operations on `table` that are also supported by DBESDK are:
+# Supported operations on Tables that are also supported by DBESDK are:
 # - put_item
 # - get_item
 # - query
 # - scan
-# Unsupported operations on `table` are that are supported by DBESDK are:
+# https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb/table/index.html#DynamoDB.Table
+# 
+# Unsupported operations on Tables are that are supported by DBESDK are:
 # - transact_get_items
 # - transact_write_items
 # - batch_get_item
-# Remove any tests that call unsupported operations.
+# Remove any tests that call unsupported operations by overriding the test method to do nothing.
 # If more tests that call these operations are added, remove them below.
-# If the list below becomes unmaintainable,
-# or if other languages add clients with unsupported operations,
-# refactor the Dafny code to conditionally call tests
-# based on whether the client supports the operation under test.
+# If the list below becomes unmaintainable, or if other languages add clients with unsupported operations,
+# refactor the Dafny code to conditionally call tests based on whether the client supports the operation under test.
 
 def EmptyTest(*args):
   pass