m

Author: Lucas McDonald

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

@@ -1,5 +1,8 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
+import uuid
+from copy import deepcopy
+
 import boto3
 import pytest
 
@@ -8,8 +11,6 @@
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_transforms.errors import (
     DynamoDbEncryptionTransformsException,
 )
-import uuid
-from copy import deepcopy
 
 from ...constants import (
     INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
@@ -112,11 +113,13 @@ def client(encrypted, expect_standard_dictionaries):
 def use_complex_item(request):
     return request.param
 
+
 # Append a suffix to the partition key to avoid collisions between test runs.
 @pytest.fixture(scope="module")
 def test_run_suffix():
     return str(uuid.uuid4())
 
+
 @pytest.fixture
 def test_item(expect_standard_dictionaries, use_complex_item, test_run_suffix):
     """Get a single test item in the appropriate format for the client."""
@@ -137,6 +140,7 @@ def test_item(expect_standard_dictionaries, use_complex_item, test_run_suffix):
         item["partition_key"] += test_run_suffix
     return item
 
+
 @pytest.fixture
 def test_key(expect_standard_dictionaries, use_complex_item, test_run_suffix):
     """Get a single test item in the appropriate format for the client."""
@@ -635,6 +639,7 @@ def test_WHEN_call_passthrough_method_THEN_correct_response_is_returned():
     # Then: Correct response is returned, i.e. EncryptedClient forwards the call to the underlying boto3 client
     assert response["ResponseMetadata"]["HTTPStatusCode"] == 200
 
+
 # Delete the items in the table after the module runs
 @pytest.fixture(scope="module", autouse=True)
 def cleanup_after_module(test_run_suffix):

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

@@ -1,8 +1,9 @@
-import boto3
-import pytest
 import uuid
 from copy import deepcopy
 
+import boto3
+import pytest
+
 from aws_dbesdk_dynamodb.encrypted.client import EncryptedClient
 
 from ...constants import (
@@ -20,6 +21,7 @@
     simple_key_dict,
 )
 from ...requests import (
+    basic_delete_item_request_ddb,
     basic_put_item_request_ddb,
     basic_put_item_request_dict,
     basic_query_paginator_request,
@@ -88,11 +90,13 @@ def scan_paginator(client):
 def use_complex_item(request):
     return request.param
 
+
 # Append a suffix to the partition key to avoid collisions between test runs.
 @pytest.fixture(scope="module")
 def test_run_suffix():
     return str(uuid.uuid4())
 
+
 @pytest.fixture
 def test_key(expect_standard_dictionaries, use_complex_item, test_run_suffix):
     """Get a single test item in the appropriate format for the client."""
@@ -113,6 +117,7 @@ def test_key(expect_standard_dictionaries, use_complex_item, test_run_suffix):
         key["partition_key"] += test_run_suffix
     return key
 
+
 @pytest.fixture
 def multiple_test_keys(expect_standard_dictionaries, test_run_suffix):
     """Get two test keys in the appropriate format for the client."""
@@ -128,6 +133,7 @@ def multiple_test_keys(expect_standard_dictionaries, test_run_suffix):
             key["partition_key"] += test_run_suffix
     return keys
 
+
 @pytest.fixture
 def test_item(expect_standard_dictionaries, use_complex_item, test_run_suffix):
     """Get a single test item in the appropriate format for the client."""
@@ -218,3 +224,14 @@ def test_GIVEN_scan_paginator_WHEN_paginate_THEN_returns_expected_items(
     actual_item = sort_dynamodb_json_lists(items[0])
     # Then: Items are equal
     assert expected_item == actual_item
+
+
+# Delete the items in the table after the module runs
+@pytest.fixture(scope="module", autouse=True)
+def cleanup_after_module(test_run_suffix):
+    yield
+    table = boto3.client("dynamodb")
+    items = [deepcopy(simple_item_ddb), deepcopy(complex_item_ddb)]
+    for item in items:
+        item["partition_key"]["S"] += test_run_suffix
+        table.delete_item(**basic_delete_item_request_ddb(item))

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

@@ -1,17 +1,26 @@
-import boto3
-import pytest
 import uuid
 from copy import deepcopy
 
+import boto3
+import pytest
+
 from aws_dbesdk_dynamodb.encrypted.resource import EncryptedResource, EncryptedTablesCollectionManager
 from aws_dbesdk_dynamodb.encrypted.table import EncryptedTable
 
 from ...constants import INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, INTEG_TEST_DEFAULT_TABLE_CONFIGS
-from ...items import complex_item_dict, complex_key_dict, simple_item_dict, simple_key_dict
+from ...items import (
+    complex_item_ddb,
+    complex_item_dict,
+    complex_key_dict,
+    simple_item_ddb,
+    simple_item_dict,
+    simple_key_dict,
+)
 from ...requests import (
     basic_batch_get_item_request_dict,
     basic_batch_write_item_delete_request_dict,
     basic_batch_write_item_put_request_dict,
+    basic_delete_item_request_ddb,
 )
 
 
@@ -43,17 +52,20 @@ def resource(encrypted):
 def tables(resource):
     return resource.tables
 
+
 @pytest.fixture(scope="module")
 def test_run_suffix():
     return str(uuid.uuid4())
 
+
 @pytest.fixture
 def test_items(test_run_suffix):
     items = [deepcopy(complex_item_dict), deepcopy(simple_item_dict)]
     for item in items:
         item["partition_key"] += test_run_suffix
     return items
 
+
 @pytest.fixture
 def test_keys(test_run_suffix):
     keys = [deepcopy(complex_key_dict), deepcopy(simple_key_dict)]
@@ -174,3 +186,14 @@ def test_GIVEN_tables_WHEN_page_size_THEN_returns_tables(
         tables_list.append(table)
     # Then: Returns tables
     assert len(tables_list) > 0
+
+
+# Delete the items in the table after the module runs
+@pytest.fixture(scope="module", autouse=True)
+def cleanup_after_module(test_run_suffix):
+    yield
+    table = boto3.client("dynamodb")
+    items = [deepcopy(simple_item_ddb), deepcopy(complex_item_ddb)]
+    for item in items:
+        item["partition_key"]["S"] += test_run_suffix
+        table.delete_item(**basic_delete_item_request_ddb(item))

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

@@ -1,8 +1,9 @@
-import boto3
-import pytest
 import uuid
 from copy import deepcopy
 
+import boto3
+import pytest
+
 from aws_dbesdk_dynamodb.encrypted.table import EncryptedTable
 from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_transforms.errors import (
     DynamoDbEncryptionTransformsException,
@@ -59,10 +60,12 @@ def table(encrypted):
     else:
         return plaintext_table()
 
+
 @pytest.fixture(scope="module")
 def test_run_suffix():
     return str(uuid.uuid4())
 
+
 # Creates a matrix of tests for each value in param,
 # with a user-friendly string for test output:
 # use_complex_item = True -> "complex_item"
@@ -239,6 +242,7 @@ def test_WHEN_call_passthrough_method_THEN_correct_response_is_returned():
     # Then: Correct response is returned, i.e. EncryptedTable forwards the call to the underlying boto3 table
     assert response == INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME
 
+
 # Delete the items in the table after the module runs
 @pytest.fixture(scope="module", autouse=True)
 def cleanup_after_module(test_run_suffix):