normalize EncryptionMaterials._encrypted_data_keys to list and encrypted_data_keys to tuple

Author: mattsb42-aws

src/aws_encryption_sdk/materials_managers/__init__.py

@@ -243,7 +243,7 @@ def encrypted_data_keys(self):
 
         :rtype: frozenset
         """
-        return frozenset(self._encrypted_data_keys)
+        return tuple(self._encrypted_data_keys)
 
     @property
     def is_complete(self):
@@ -305,7 +305,7 @@ def add_encrypted_data_key(self, encrypted_data_key, keyring_trace):
         if keyring_trace.wrapping_key != encrypted_data_key.key_provider:
             raise InvalidKeyringTraceError("Keyring trace does not match data key encryptor.")
 
-        self._encrypted_data_keys.add(encrypted_data_key)
+        self._encrypted_data_keys.append(encrypted_data_key)
         self._keyring_trace.append(keyring_trace)
 
     def add_signing_key(self, signing_key):

test/unit/test_material_managers.py

@@ -68,11 +68,11 @@
     "EncryptionMaterials": dict(
         algorithm=ALGORITHM,
         data_encryption_key=_DATA_KEY,
-        encrypted_data_keys=set([]),
+        encrypted_data_keys=[],
         encryption_context={},
         signing_key=_SIGNING_KEY.key_bytes(),
     ),
-    "DecryptionMaterialsRequest": dict(algorithm=ALGORITHM, encrypted_data_keys=set([]), encryption_context={}),
+    "DecryptionMaterialsRequest": dict(algorithm=ALGORITHM, encrypted_data_keys=[], encryption_context={}),
     "DecryptionMaterials": dict(
         data_key=_DATA_KEY, verification_key=_VERIFICATION_KEY.key_bytes(), algorithm=ALGORITHM, encryption_context={}
     ),
@@ -143,7 +143,7 @@ def test_encryption_materials_request_attributes_defaults():
 
 def test_encryption_materials_defaults():
     test = EncryptionMaterials(
-        algorithm=ALGORITHM, data_encryption_key=_DATA_KEY, encrypted_data_keys=set([]), encryption_context={}
+        algorithm=ALGORITHM, data_encryption_key=_DATA_KEY, encrypted_data_keys=[], encryption_context={}
     )
     assert test.signing_key is None
 
@@ -229,15 +229,15 @@ def test_immutable_encrypted_data_keys():
     materials = EncryptionMaterials(**_VALID_KWARGS["EncryptionMaterials"])
 
     with pytest.raises(AttributeError):
-        materials.encrypted_data_keys.add(42)
+        materials.encrypted_data_keys.append(42)
 
 
 def test_empty_encrypted_data_keys():
     materials = EncryptionMaterials(**_copy_and_update_kwargs("EncryptionMaterials", dict(encrypted_data_keys=_REMOVE)))
 
     edks = materials.encrypted_data_keys
 
-    assert isinstance(edks, frozenset)
+    assert isinstance(edks, tuple)
     assert not edks
 
 

test/unit/test_material_managers_default.py

@@ -41,7 +41,7 @@ def patch_for_dcmm_encrypt(mocker):
     DefaultCryptoMaterialsManager._generate_signing_key_and_update_encryption_context.return_value = mock_signing_key
     mocker.patch.object(aws_encryption_sdk.materials_managers.default, "prepare_data_keys")
     mock_data_encryption_key = _DATA_KEY
-    mock_encrypted_data_keys = set([_ENCRYPTED_DATA_KEY])
+    mock_encrypted_data_keys = (_ENCRYPTED_DATA_KEY,)
     result_pair = mock_data_encryption_key, mock_encrypted_data_keys
     aws_encryption_sdk.materials_managers.default.prepare_data_keys.return_value = result_pair
     yield result_pair, mock_signing_key
@@ -165,7 +165,7 @@ def test_get_encryption_materials_primary_mk_not_in_mks(patch_for_dcmm_encrypt):
     cmm = build_cmm()
     cmm.master_key_provider.master_keys_for_encryption.return_value = (
         sentinel.primary_mk,
-        set([sentinel.mk_a, sentinel.mk_b]),
+        {sentinel.mk_a, sentinel.mk_b},
     )
 
     with pytest.raises(MasterKeyProviderError) as excinfo: