m

Author: Lucas McDonald

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

@@ -13,7 +13,10 @@
 from ...items import complex_item_ddb, complex_item_dict, simple_item_ddb, simple_item_dict
 
 
-# Creates a matrix
+# Creates a matrix of tests for each value in param,
+# with a user-friendly string for test output:
+# use_complex_item = True -> "complex_item"
+# use_complex_item = False -> "simple_item"
 @pytest.fixture(params=[True, False], ids=["complex_item", "simple_item"])
 def use_complex_item(request):
     return request.param

Examples/runtimes/python/DynamoDBEncryption/src/item_encryptor/encrypt_decrypt_example.py

@@ -1,3 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """
 Set up an ItemEncryptor and use its APIs to encrypt and decrypt items in 3 different formats.
 
@@ -45,7 +47,7 @@ def encrypt_decrypt_example(kms_key_id: str, ddb_table_name: str) -> None:
     """Encrypt and decrypt an item with an ItemEncryptor."""
     # 1. Create a Keyring. This Keyring will be responsible for protecting the data keys that protect your data.
     #    For this example, we will create a AWS KMS Keyring with the AWS KMS Key we want to use.
-    #    We will use the `CreateMrkMultiKeyring` method to create this keyring,
+    #    We will use the `CreateAwsKmsMrkMultiKeyringInput` method to create this keyring,
     #    as it will correctly handle both single region and Multi-Region KMS Keys.
     mat_prov: AwsCryptographicMaterialProviders = AwsCryptographicMaterialProviders(config=MaterialProvidersConfig())
     kms_mrk_multi_keyring_input: CreateAwsKmsMrkMultiKeyringInput = CreateAwsKmsMrkMultiKeyringInput(

Examples/runtimes/python/DynamoDBEncryption/test/item_encryptor/test_item_encryptor.py

@@ -1,6 +1,6 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-"""Test suite for the EncryptedClient example."""
+"""Test suite for the ItemEncryptor example."""
 import pytest
 
 from ...src.item_encryptor.encrypt_decrypt_example import encrypt_decrypt_example
@@ -9,7 +9,7 @@
 
 
 def test_encrypt_decrypt_example():
-    """Test function for encrypt and decrypt using the EncryptedClient example."""
+    """Test function for encrypt and decrypt using the ItemEncryptor example."""
     test_kms_key_id = "arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f"
     test_dynamodb_table_name = "DynamoDbEncryptionInterceptorTestTable"
     encrypt_decrypt_example(test_kms_key_id, test_dynamodb_table_name)

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

@@ -1,3 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 import boto3
 import types
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient

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

@@ -1,5 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 import boto3
-import types
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
 import aws_cryptography_internal_dynamodb.internaldafny.extern
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_DynamoDbTablesEncryptionConfig
@@ -25,7 +26,7 @@
 # When querying, DBESDK DDB TestVectors will pass the Table the query as a string.
 # The Table could accept this string as-is and process it correctly.
 # However, EncryptedTables have extra logic to process boto3 Conditions.
-# We want to test this extra logic as much as possible.
+# I want to test this extra logic as much as possible.
 # This map converts some known query strings to equivalent Conditions.
 # TestVectors will pass the query string (map key) to the Table;
 # the Table's internal logic will look up the query string in this map:
@@ -82,17 +83,17 @@
     # "Complex" queries
     "Comp1 := :cmp1a": Attr("Comp1").eq(":cmp1a"),
     "begins_with(Comp1, :cmp1c)": Attr("Comp1").begins_with(":cmp1c"),
-    # Another query that can't be translated to boto3 Conditions,
-    # since attribute values aren't attribute names.
-    # Pass the original string through.
-    ":cmp1c <= Comp1": ":cmp1c <= Comp1",
-
     "cmp1c < Comp1": Attr("cmp1c").lt("Comp1"),
     "cmp1c = Comp1": Attr("cmp1c").eq("Comp1"),
     "begins_with(Comp1, :cmp1d)": Attr("Comp1").begins_with(":cmp1d"),
     "contains(Comp1, :cmp1c)": Attr("Comp1").contains(":cmp1c"),
     "contains(Comp1, :cmp1d)": Attr("Comp1").contains(":cmp1d"),
     "Comp1 = :cmp1b": Attr("Comp1").eq(":cmp1b"),
+
+    # Another query that can't be translated to boto3 Conditions,
+    # since attribute values aren't attribute names.
+    # Pass the original string through.
+    ":cmp1c <= Comp1": ":cmp1c <= Comp1",
 }
 
 class DynamoDBClientWrapperForDynamoDBTable:

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

@@ -1,24 +1,15 @@
-import boto3
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_DynamoDbItemEncryptorConfig
 from aws_dbesdk_dynamodb.encrypted.item import ItemEncryptor
 from smithy_dafny_standard_library.internaldafny.generated import Wrappers
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.errors import _smithy_error_to_dafny_error
 from aws_dbesdk_dynamodb_test_vectors.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.shim import DynamoDbItemEncryptorShim
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.models import (
-    DecryptItemInput,
     DecryptItemOutput,
-    EncryptItemInput,
     EncryptItemOutput,
 )
-from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.smithy_to_dafny import (
-    aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_EncryptItemOutput as SmithyToDafnyEncryptItemOutput,
-    aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_DecryptItemOutput as SmithyToDafnyDecryptItemOutput,
-)
-from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.dafny_to_smithy import (
-    aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_EncryptItemInput as DafnyToSmithyEncryptItemInput,
-    aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_DecryptItemInput as DafnyToSmithyDecryptItemInput,
-)
 from aws_dbesdk_dynamodb.transform import (
     dict_to_ddb,
     ddb_to_dict,
@@ -32,6 +23,7 @@ class DynamoDBFormatToDictFormatWrapper:
     However, the legacy Python DDBEC ItemEncryptor also supports Python dictionary-formatted items.
     This class transforms Dafny TestVectors' DynamoDB-formatted items
         to Python DBESDK's ItemEncryptor's Python dictionary-formatted encryption methods.
+    This improves the test coverage of the ItemEncryptor.
     """
     def __init__(self, item_encryptor):
         self._item_encryptor = item_encryptor

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

@@ -1,16 +1,12 @@
-import boto3
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_DynamoDbItemEncryptorConfig
 from aws_dbesdk_dynamodb.encrypted.item import ItemEncryptor
 from smithy_dafny_standard_library.internaldafny.generated import Wrappers
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.errors import _smithy_error_to_dafny_error
 from aws_dbesdk_dynamodb_test_vectors.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.shim import DynamoDbItemEncryptorShim
-from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.models import (
-    DecryptItemInput,
-    EncryptItemInput,
-)
 
-# In contrast to 
 
 class default__:
     @staticmethod