cleanup

Author: lucasmcdonald3

examples/src/keyrings/required_encryption_context_cmm.py

@@ -14,25 +14,17 @@
 from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import (
-    CacheTypeDefault,
     CreateAwsKmsKeyringInput,
     CreateDefaultCryptographicMaterialsManagerInput,
     CreateRequiredEncryptionContextCMMInput,
-    DefaultCache,
 )
-from aws_cryptographic_materialproviders.mpl.references import (
-    IKeyring,
-    ICryptographicMaterialsManager,
-)
-from aws_encryption_sdk.materials_managers.mpl.cmm import CryptoMaterialsManagerFromMPL
-from typing import Dict
+from aws_cryptographic_materialproviders.mpl.references import ICryptographicMaterialsManager, IKeyring
+from typing import Dict, List
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
 from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
 
-from .example_branch_key_id_supplier import ExampleBranchKeyIdSupplier
-
 # TODO-MPL: Remove this as part of removing PYTHONPATH hacks
 module_root_dir = '/'.join(__file__.split("/")[:-1])
 
@@ -98,7 +90,7 @@ def encrypt_and_decrypt_with_keyring(
                 underlying_cmm=underlying_cmm,
             )
         )
-    
+
     # 6. Encrypt the data
     ciphertext, _ = client.encrypt(
         source=EXAMPLE_DATA,

src/aws_encryption_sdk/internal/formatting/serialize.py

@@ -223,7 +223,7 @@ def _serialize_header_auth_v2(
     header,
     data_encryption_key,
     signer=None,
-    required_encryption_context_bytes=None
+    required_ec_bytes=None
 ):
     """Creates serialized header authentication data for messages in serialization version V2.
 
@@ -241,7 +241,7 @@ def _serialize_header_auth_v2(
     :returns: Serialized header authentication data
     :rtype: bytes
     """
-    if required_encryption_context_bytes is None:
+    if required_ec_bytes is None:
         header_auth = encrypt(
             algorithm=algorithm,
             key=data_encryption_key,
@@ -259,7 +259,7 @@ def _serialize_header_auth_v2(
             # be the encryption context in the encryption materials filtered to only contain key value
             # pairs listed in the encryption material's required encryption context keys serialized
             # according to the encryption context serialization specification.
-            associated_data=header + required_encryption_context_bytes,
+            associated_data=header + required_ec_bytes,
             iv=header_auth_iv(algorithm),
         )
     output = struct.pack(
@@ -277,7 +277,7 @@ def serialize_header_auth(
     header,
     data_encryption_key,
     signer=None,
-    required_encryption_context_bytes=None
+    required_ec_bytes=None
 ):
     """Creates serialized header authentication data.
 
@@ -302,7 +302,7 @@ def serialize_header_auth(
         return _serialize_header_auth_v1(algorithm, header, data_encryption_key, signer)
     elif version == SerializationVersion.V2:
         return _serialize_header_auth_v2(
-            algorithm, header, data_encryption_key, signer, required_encryption_context_bytes
+            algorithm, header, data_encryption_key, signer, required_ec_bytes
         )
     else:
         raise SerializationError("Unrecognized message format version: {}".format(version))

src/aws_encryption_sdk/materials_managers/mpl/materials.py

@@ -97,6 +97,8 @@ def signing_key(self) -> bytes:
         return self.mpl_materials.signing_key
 
     @property
+    # Pylint thinks this name is too long, but it's the best descriptor for this...
+    # pylint: disable=invalid-name
     def required_encryption_context_keys(self) -> bytes:
         """Materials' required encryption context keys."""
         return self.mpl_materials.required_encryption_context_keys
@@ -148,6 +150,8 @@ def encryption_context(self) -> Dict[str, str]:
         return self.mpl_materials.encryption_context
 
     @property
+    # Pylint thinks this name is too long, but it's the best descriptor for this...
+    # pylint: disable=invalid-name
     def required_encryption_context_keys(self) -> bytes:
         """Materials' required encryption context keys."""
         return self.mpl_materials.required_encryption_context_keys

src/aws_encryption_sdk/streaming_client.py

@@ -76,9 +76,7 @@
     from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
     from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
     from aws_cryptographic_materialproviders.mpl.errors import AwsCryptographicMaterialProvidersException
-    from aws_cryptographic_materialproviders.mpl.models import (
-        CreateDefaultCryptographicMaterialsManagerInput,
-    )
+    from aws_cryptographic_materialproviders.mpl.models import CreateDefaultCryptographicMaterialsManagerInput
     from aws_cryptographic_materialproviders.mpl.references import (
         ICryptographicMaterialsManager as MPL_ICryptographicMaterialsManager,
         IKeyring as MPL_IKeyring,
@@ -631,11 +629,11 @@ def generate_header(self, message_id):
         if hasattr(self._encryption_materials, "required_encryption_context_keys"):
             self._required_encryption_context = {}
             self._stored_encryption_context = {}
-            for (k, v) in self._encryption_materials.encryption_context.items():
-                if k in self._encryption_materials.required_encryption_context_keys:
-                    self._required_encryption_context[k] = v
+            for (key, value) in self._encryption_materials.encryption_context.items():
+                if key in self._encryption_materials.required_encryption_context_keys:
+                    self._required_encryption_context[key] = value
                 else:
-                    self._stored_encryption_context[k] = v
+                    self._stored_encryption_context[key] = value
         # Otherwise, store all encryption context with the message.
         else:
             self._stored_encryption_context = self._encryption_materials.encryption_context
@@ -956,7 +954,10 @@ def _prep_message(self):
             self._prep_non_framed()
         self._message_prepped = True
 
-    def _read_header(self):  # noqa: C901
+    # TODO-MPL: Refactor this function, remove these linter disablers
+    # noqa: C901
+    # pylint: disable=too-many-branches
+    def _read_header(self):
         """Reads the message header from the input stream.
 
         :returns: tuple containing deserialized header and header_auth objects

test/unit/test_streaming_client_stream_decryptor.py

@@ -238,7 +238,7 @@ def test_read_header(self, mock_derive_datakey, mock_decrypt_materials_request,
     @patch("aws_encryption_sdk.streaming_client.Verifier")
     # Given: no MPL
     @pytest.mark.skipif(HAS_MPL, reason="Test should only be executed without MPL in installation")
-    def test_GIVEN_verification_key_AND_no_mpl_WHEN_read_header_THEN_calls_from_key_bytes(
+    def test_GIVEN_decrypt_config_has_ec_WHEN_read_header_THEN_calls_decrypt_materials_with_reproduced_ec(
         self,
         mock_verifier,
         mock_decrypt_materials_request,