feedback

Author: imabhichow

DynamoDbEncryption/runtimes/python/test/integ/legacy/utils.py

@@ -87,37 +87,26 @@ def create_legacy_encrypted_resource(attribute_actions=None):
 # AWS DBE SDK interface creation functions with legacy override
 
 
-def create_encryption_config(legacy_encryptor=None, legacy_policy=None):
+def create_encryption_config(legacy_encryptor, legacy_policy):
     """Create a DynamoDbTableEncryptionConfig with optional legacy override."""
-    if legacy_encryptor is not None and legacy_policy is not None:
-        # Configure legacy behavior
-        legacy_override = LegacyOverride(
-            encryptor=legacy_encryptor,
-            attribute_actions_on_encrypt=INTEG_TEST_DEFAULT_ATTRIBUTE_ACTIONS_ON_ENCRYPT,
-            policy=legacy_policy,
-        )
-
-        # Create the table config with legacy override
-        table_config = DynamoDbTableEncryptionConfig(
-            logical_table_name=INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
-            partition_key_name="partition_key",
-            sort_key_name="sort_key",
-            attribute_actions_on_encrypt=INTEG_TEST_DEFAULT_ATTRIBUTE_ACTIONS_ON_ENCRYPT,
-            keyring=INTEG_TEST_DEFAULT_KEYRING,
-            legacy_override=legacy_override,
-            allowed_unsigned_attribute_prefix=INTEG_TEST_DEFAULT_UNSIGNED_ATTRIBUTE_PREFIX,
-        )
-    else:
-        # Create a pure AWS Database Encryption SDK table config (no legacy override)
-        table_config = DynamoDbTableEncryptionConfig(
-            logical_table_name=INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
-            partition_key_name="partition_key",
-            sort_key_name="sort_key",
-            attribute_actions_on_encrypt=INTEG_TEST_DEFAULT_ATTRIBUTE_ACTIONS_ON_ENCRYPT,
-            keyring=INTEG_TEST_DEFAULT_KEYRING,
-            allowed_unsigned_attribute_prefix=INTEG_TEST_DEFAULT_UNSIGNED_ATTRIBUTE_PREFIX,
-            algorithm_suite_id=INTEG_TEST_DEFAULT_ALGORITHM_SUITE_ID,
-        )
+    # Configure legacy behavior
+    legacy_override = LegacyOverride(
+        encryptor=legacy_encryptor,
+        attribute_actions_on_encrypt=INTEG_TEST_DEFAULT_ATTRIBUTE_ACTIONS_ON_ENCRYPT,
+        policy=legacy_policy,
+    )
+
+    # Create the table config with legacy override
+    table_config = DynamoDbTableEncryptionConfig(
+        logical_table_name=INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
+        partition_key_name="partition_key",
+        sort_key_name="sort_key",
+        attribute_actions_on_encrypt=INTEG_TEST_DEFAULT_ATTRIBUTE_ACTIONS_ON_ENCRYPT,
+        keyring=INTEG_TEST_DEFAULT_KEYRING,
+        legacy_override=legacy_override,
+        allowed_unsigned_attribute_prefix=INTEG_TEST_DEFAULT_UNSIGNED_ATTRIBUTE_PREFIX,
+        algorithm_suite_id=INTEG_TEST_DEFAULT_ALGORITHM_SUITE_ID,
+    )
 
     # Create the tables config
     table_configs = {INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME: table_config}