fix

Author: lucasmcdonald3

src/aws_encryption_sdk/materials_managers/mpl/__init__.py

@@ -10,4 +10,7 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-"""Modules related to the MPL's materials managers interfaces."""
+"""Modules related to the MPL's materials managers interfaces.
+
+The aws-cryptographic-materials-library MUST be installed to use these modules.
+"""

src/aws_encryption_sdk/materials_managers/mpl/cmm.py

@@ -60,9 +60,10 @@ def get_encryption_materials(
         :param request: Request for encryption materials
         """
         try:
-            mpl_input: MPL_GetEncryptionMaterialsInput = CryptoMaterialsManagerFromMPL._native_to_mpl_get_encryption_materials(
-                request
-            )
+            mpl_input: MPL_GetEncryptionMaterialsInput = \
+                CryptoMaterialsManagerFromMPL._native_to_mpl_get_encryption_materials(
+                    request
+                )
             mpl_output: MPL_GetEncryptionMaterialsOutput = self.mpl_cmm.get_encryption_materials(mpl_input)
             return EncryptionMaterialsFromMPL(mpl_output.encryption_materials)
         except AwsCryptographicMaterialProvidersException as mpl_exception:

src/aws_encryption_sdk/streaming_client.py

@@ -555,7 +555,7 @@ def _prep_message(self):
             # MPL verification key is PEM bytes, not DER bytes.
             # If the underlying CMM is from the MPL, load PEM bytes.
             if (_HAS_MPL
-                and isinstance(self.config.materials_manager, CryptoMaterialsManagerFromMPL)):
+                    and isinstance(self.config.materials_manager, CryptoMaterialsManagerFromMPL)):
                 self.signer = Signer.from_key_bytes(
                     algorithm=self._encryption_materials.algorithm, key_bytes=self._encryption_materials.signing_key,
                     encoding=serialization.Encoding.PEM,
@@ -923,7 +923,7 @@ def _read_header(self):
             # MPL verification key is NOT key bytes; it is bytes of the compressed point.
             # If the underlying CMM is from the MPL, load bytes from encoded point.
             if (_HAS_MPL
-                and isinstance(self.config.materials_manager, CryptoMaterialsManagerFromMPL)):
+                    and isinstance(self.config.materials_manager, CryptoMaterialsManagerFromMPL)):
                 self.verifier = Verifier.from_encoded_point(
                     algorithm=header.algorithm,
                     encoded_point=base64.b64encode(decryption_materials.verification_key)

test/mpl/__init__.py

@@ -10,4 +10,7 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-"""Module containing tests that REQUIRE the aws-cryptographic-material-providers library to run."""
+"""Module testing components that use the MPL.
+
+The aws-cryptographic-materials-library MUST be installed to run tests in this module.
+"""

test/mpl/unit/test_material_managers_mpl_cmm.py

@@ -10,7 +10,10 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-"""Unit test suite to validate aws_encryption_sdk.materials_managers.mpl.cmm logic."""
+"""Unit test suite to validate aws_encryption_sdk.materials_managers.mpl.cmm logic.
+
+The aws-cryptographic-materials-library MUST be installed to run tests in this module.
+"""
 
 import pytest
 from aws_cryptographic_materialproviders.mpl.errors import AwsCryptographicMaterialProvidersException

test/mpl/unit/test_material_managers_mpl_materials.py

@@ -10,15 +10,18 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-"""Unit test suite to validate aws_encryption_sdk.materials_managers.mpl.cmm logic."""
+"""Unit test suite to validate aws_encryption_sdk.materials_managers.mpl.materials logic.
+
+The aws-cryptographic-materials-library MUST be installed to run tests in this module.
+"""
 
 import pytest
 from aws_cryptographic_materialproviders.mpl.models import (
     DecryptionMaterials as MPL_DecryptionMaterials,
     EncryptedDataKey as MPL_EncryptedDataKey,
     EncryptionMaterials as MPL_EncryptionMaterials,
 )
-from mock import MagicMock, PropertyMock, patch
+from mock import MagicMock, patch
 from typing import Dict, List, Set
 
 import aws_encryption_sdk.materials_managers.mpl.materials