verify that attributes are always set for all KMS CMPs

Author: mattsb42-aws

test/functional/functional_test_utils.py

@@ -290,10 +290,7 @@ def _all_possible_cmps(algorithm_generator, require_attributes):
         else:
             outer_cmp = inner_cmp
 
-        yield pytest.param(
-            outer_cmp,
-            id=id_string,
-        )
+        yield pytest.param(outer_cmp, id=id_string)
 
 
 def set_parametrized_cmp(metafunc, require_attributes=True):

test/integration/encrypted/test_client.py

@@ -14,9 +14,9 @@
 import pytest
 
 from ..integration_test_utils import (  # noqa pylint: disable=unused-import
-    aws_kms_cmp,
     ddb_table_name,
     functional_test_utils,
+    set_parameterized_kms_cmps,
 )
 
 pytestmark = [pytest.mark.integ, pytest.mark.ddb_integ]
@@ -26,6 +26,7 @@ def pytest_generate_tests(metafunc):
     functional_test_utils.set_parametrized_actions(metafunc)
     functional_test_utils.set_parametrized_cmp(metafunc)
     functional_test_utils.set_parametrized_item(metafunc)
+    set_parameterized_kms_cmps(metafunc)
 
 
 def test_ephemeral_item_cycle(ddb_table_name, some_cmps, parametrized_actions, parametrized_item):
@@ -35,10 +36,10 @@ def test_ephemeral_item_cycle(ddb_table_name, some_cmps, parametrized_actions, p
     )
 
 
-def test_ephemeral_item_cycle_kms(ddb_table_name, aws_kms_cmp, parametrized_actions, parametrized_item):
+def test_ephemeral_item_cycle_kms(ddb_table_name, all_aws_kms_cmps, parametrized_actions, parametrized_item):
     """Test the AWS KMS CMP against a small number of curated items."""
     functional_test_utils.client_cycle_single_item_check(
-        aws_kms_cmp, parametrized_actions, parametrized_item, ddb_table_name
+        all_aws_kms_cmps, parametrized_actions, parametrized_item, ddb_table_name
     )
 
 
@@ -49,10 +50,10 @@ def test_ephemeral_batch_item_cycle(ddb_table_name, some_cmps, parametrized_acti
     )
 
 
-def test_ephemeral_batch_item_cycle_kms(ddb_table_name, aws_kms_cmp, parametrized_actions, parametrized_item):
+def test_ephemeral_batch_item_cycle_kms(ddb_table_name, all_aws_kms_cmps, parametrized_actions, parametrized_item):
     """Test the AWS KMS CMP against a small number of curated items."""
     functional_test_utils.client_cycle_batch_items_check(
-        aws_kms_cmp, parametrized_actions, parametrized_item, ddb_table_name
+        all_aws_kms_cmps, parametrized_actions, parametrized_item, ddb_table_name
     )
 
 
@@ -64,9 +65,9 @@ def test_ephemeral_batch_item_cycle_scan_paginator(ddb_table_name, some_cmps, pa
 
 
 def test_ephemeral_batch_item_cycle_scan_paginator_kms(
-    ddb_table_name, aws_kms_cmp, parametrized_actions, parametrized_item
+    ddb_table_name, all_aws_kms_cmps, parametrized_actions, parametrized_item
 ):
     """Test a the AWS KMS CMP against a small number of curated items using the scan paginator."""
     functional_test_utils.client_cycle_batch_items_check_scan_paginator(
-        aws_kms_cmp, parametrized_actions, parametrized_item, ddb_table_name
+        all_aws_kms_cmps, parametrized_actions, parametrized_item, ddb_table_name
     )

test/integration/encrypted/test_resource.py

@@ -14,9 +14,9 @@
 import pytest
 
 from ..integration_test_utils import (  # noqa pylint: disable=unused-import
-    aws_kms_cmp,
     ddb_table_name,
     functional_test_utils,
+    set_parameterized_kms_cmps,
 )
 
 pytestmark = [pytest.mark.integ, pytest.mark.ddb_integ]
@@ -26,6 +26,7 @@ def pytest_generate_tests(metafunc):
     functional_test_utils.set_parametrized_actions(metafunc)
     functional_test_utils.set_parametrized_cmp(metafunc)
     functional_test_utils.set_parametrized_item(metafunc)
+    set_parameterized_kms_cmps(metafunc)
 
 
 def test_ephemeral_batch_item_cycle(ddb_table_name, some_cmps, parametrized_actions, parametrized_item):
@@ -35,8 +36,8 @@ def test_ephemeral_batch_item_cycle(ddb_table_name, some_cmps, parametrized_acti
     )
 
 
-def test_ephemeral_batch_item_cycle_kms(ddb_table_name, aws_kms_cmp, parametrized_actions, parametrized_item):
+def test_ephemeral_batch_item_cycle_kms(ddb_table_name, all_aws_kms_cmps, parametrized_actions, parametrized_item):
     """Test the AWS KMS CMP against a small number of curated items."""
     functional_test_utils.resource_cycle_batch_items_check(
-        aws_kms_cmp, parametrized_actions, parametrized_item, ddb_table_name
+        all_aws_kms_cmps, parametrized_actions, parametrized_item, ddb_table_name
     )

test/integration/encrypted/test_table.py

@@ -14,9 +14,9 @@
 import pytest
 
 from ..integration_test_utils import (  # noqa pylint: disable=unused-import
-    aws_kms_cmp,
     ddb_table_name,
     functional_test_utils,
+    set_parameterized_kms_cmps,
 )
 
 pytestmark = [pytest.mark.integ, pytest.mark.ddb_integ]
@@ -26,6 +26,7 @@ def pytest_generate_tests(metafunc):
     functional_test_utils.set_parametrized_actions(metafunc)
     functional_test_utils.set_parametrized_cmp(metafunc)
     functional_test_utils.set_parametrized_item(metafunc)
+    set_parameterized_kms_cmps(metafunc)
 
 
 def test_ephemeral_item_cycle(ddb_table_name, some_cmps, parametrized_actions, parametrized_item):
@@ -40,6 +41,6 @@ def test_ephemeral_item_cycle_batch_writer(ddb_table_name, some_cmps, parametriz
     )
 
 
-def test_ephemeral_item_cycle_kms(ddb_table_name, aws_kms_cmp, parametrized_actions, parametrized_item):
+def test_ephemeral_item_cycle_kms(ddb_table_name, all_aws_kms_cmps, parametrized_actions, parametrized_item):
     """Test the AWS KMS CMP against a small number of curated items."""
-    functional_test_utils.table_cycle_check(aws_kms_cmp, parametrized_actions, parametrized_item, ddb_table_name)
+    functional_test_utils.table_cycle_check(all_aws_kms_cmps, parametrized_actions, parametrized_item, ddb_table_name)

test/integration/integration_test_utils.py

@@ -48,9 +48,15 @@ def cmk_arn():
     return cmk_arn_value()
 
 
-@pytest.fixture
-def aws_kms_cmp():
-    return AwsKmsCryptographicMaterialsProvider(key_id=cmk_arn_value())
+def set_parameterized_kms_cmps(metafunc, require_attributes=True):
+    inner_cmp = AwsKmsCryptographicMaterialsProvider(key_id=cmk_arn_value())
+    if require_attributes:
+        outer_cmp = functional_test_utils.PassThroughCryptographicMaterialsProviderThatRequiresAttributes(inner_cmp)
+    else:
+        outer_cmp = inner_cmp
+
+    if "all_aws_kms_cmps" in metafunc.fixturenames:
+        metafunc.parametrize("all_aws_kms_cmps", (pytest.param(outer_cmp, id="Standard KMS CMP"),))
 
 
 @pytest.fixture

test/integration/material_providers/test_aws_kms.py

@@ -23,8 +23,7 @@
 from dynamodb_encryption_sdk.structures import AttributeActions, EncryptionContext
 from dynamodb_encryption_sdk.transform import dict_to_ddb
 
-from ..integration_test_utils import aws_kms_cmp  # noqa pylint: disable=unused-import
-from ..integration_test_utils import functional_test_utils, hypothesis_strategies
+from ..integration_test_utils import functional_test_utils, hypothesis_strategies, set_parameterized_kms_cmps
 
 pytestmark = pytest.mark.integ
 
@@ -34,12 +33,13 @@
 def pytest_generate_tests(metafunc):
     functional_test_utils.set_parametrized_actions(metafunc)
     functional_test_utils.set_parametrized_item(metafunc)
+    set_parameterized_kms_cmps(metafunc, require_attributes=False)
 
 
-def test_verify_user_agent(aws_kms_cmp, caplog):
+def test_verify_user_agent(all_aws_kms_cmps, caplog):
     caplog.set_level(level=logging.DEBUG)
 
-    aws_kms_cmp.encryption_materials(EncryptionContext())
+    all_aws_kms_cmps.encryption_materials(EncryptionContext())
 
     assert USER_AGENT_SUFFIX in caplog.text
 
@@ -54,10 +54,10 @@ def _many_items():
 
 
 @pytest.mark.parametrize("item", _many_items())
-def test_aws_kms_diverse_indexes(aws_kms_cmp, item):
+def test_aws_kms_diverse_indexes(all_aws_kms_cmps, item):
     """Verify that AWS KMS cycle works for items with all possible combinations for primary index attribute types."""
     crypto_config = CryptoConfig(
-        materials_provider=aws_kms_cmp,
+        materials_provider=all_aws_kms_cmps,
         encryption_context=EncryptionContext(
             partition_key_name="partition_key", sort_key_name="sort_key", attributes=dict_to_ddb(item)
         ),
@@ -68,28 +68,34 @@ def test_aws_kms_diverse_indexes(aws_kms_cmp, item):
     functional_test_utils.cycle_item_check(item, crypto_config)
 
 
-def test_aws_kms_item_cycle(aws_kms_cmp, parametrized_actions, parametrized_item):
+def test_aws_kms_item_cycle(all_aws_kms_cmps, parametrized_actions, parametrized_item):
     crypto_config = CryptoConfig(
-        materials_provider=aws_kms_cmp, encryption_context=EncryptionContext(), attribute_actions=parametrized_actions
+        materials_provider=all_aws_kms_cmps,
+        encryption_context=EncryptionContext(),
+        attribute_actions=parametrized_actions,
     )
     functional_test_utils.cycle_item_check(parametrized_item, crypto_config)
 
 
 @pytest.mark.slow
 @hypothesis_strategies.SLOW_SETTINGS
 @hypothesis.given(item=hypothesis_strategies.ddb_items)
-def test_aws_kms_item_cycle_hypothesis_slow(aws_kms_cmp, hypothesis_actions, item):
+def test_aws_kms_item_cycle_hypothesis_slow(all_aws_kms_cmps, hypothesis_actions, item):
     crypto_config = CryptoConfig(
-        materials_provider=aws_kms_cmp, encryption_context=EncryptionContext(), attribute_actions=hypothesis_actions
+        materials_provider=all_aws_kms_cmps,
+        encryption_context=EncryptionContext(),
+        attribute_actions=hypothesis_actions,
     )
     functional_test_utils.cycle_item_check(item, crypto_config)
 
 
 @pytest.mark.veryslow
 @hypothesis_strategies.VERY_SLOW_SETTINGS
 @hypothesis.given(item=hypothesis_strategies.ddb_items)
-def test_aws_kms_item_cycle_hypothesis_veryslow(aws_kms_cmp, hypothesis_actions, item):
+def test_aws_kms_item_cycle_hypothesis_veryslow(all_aws_kms_cmps, hypothesis_actions, item):
     crypto_config = CryptoConfig(
-        materials_provider=aws_kms_cmp, encryption_context=EncryptionContext(), attribute_actions=hypothesis_actions
+        materials_provider=all_aws_kms_cmps,
+        encryption_context=EncryptionContext(),
+        attribute_actions=hypothesis_actions,
     )
     functional_test_utils.cycle_item_check(item, crypto_config)