fix

Author: lucasmcdonald3

src/aws_encryption_sdk/materials_managers/mpl/cmm.py

@@ -2,6 +2,7 @@
 
 The aws-cryptographic-materials-library MUST be installed to use this module.
 """
+from typing import List
 # pylint should pass even if the MPL isn't installed
 # Also thinks these imports aren't used if it can't import them
 # noqa pylint: disable=import-error,unused-import
@@ -19,7 +20,6 @@
     ICryptographicMaterialsManager as MPL_ICryptographicMaterialsManager,
 )
 # noqa pylint: enable=import-error,unused-import
-from typing import List
 
 from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
 from aws_encryption_sdk.identifiers import CommitmentPolicy

test/mpl/unit/test_material_managers_mpl_cmm.py

@@ -76,16 +76,17 @@ def test_GIVEN_invalid_mpl_cmm_WHEN_create_CryptoMaterialsManagerFromMPL_THEN_ra
 
 
 @patch.object(mock_mpl_cmm, "get_encryption_materials")
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._native_to_mpl_get_encryption_materials")
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._native_to_mpl_get_encryption_materials")
 def test_GIVEN_valid_request_WHEN_get_encryption_materials_THEN_return_EncryptionMaterialsFromMPL(
     mock_native_to_mpl_get_encryption_materials,
     mock_get_encryption_materials,
 ):
-    
+
     # Given: _native_to_mpl_get_encryption_materials creates a MPL_GetEncryptionMaterialsInput
     mock_get_encryption_materials_input = MagicMock(__class__=MPL_GetEncryptionMaterialsInput)
     mock_native_to_mpl_get_encryption_materials.return_value = mock_get_encryption_materials_input
-    
+
     # Given: mpl_cmm.get_encryption_materials returns mock MPL encryption materials
     mock_get_encryption_materials_output = MagicMock(__class__=MPL_GetEncryptionMaterialsOutput)
     mock_get_encryption_materials_output.encryption_materials = mock_mpl_encryption_materials
@@ -104,29 +105,34 @@ def test_GIVEN_valid_request_WHEN_get_encryption_materials_THEN_return_Encryptio
     mock_mpl_cmm.get_encryption_materials.assert_called_once_with(mock_get_encryption_materials_input)
 
 
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy")
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._native_to_mpl_commmitment_policy")
 def test_GIVEN_mpl_cmm_raises_MPLException_WHEN_get_encryption_materials_THEN_raise_ESDKException(
     _
 ):
     # Then: Raises AWSEncryptionSDKClientError
     with pytest.raises(AWSEncryptionSDKClientError):
         # Given: mpl_cmm.get_encryption_materials raises MPL exception
         with patch.object(mock_mpl_cmm, "get_encryption_materials",
-                        side_effect=AwsCryptographicMaterialProvidersException("any")):
+                          side_effect=AwsCryptographicMaterialProvidersException("any")):
             # When: get_encryption_materials
             cmm = CryptoMaterialsManagerFromMPL(mpl_cmm=mock_mpl_cmm)
             cmm.get_encryption_materials(mock_encryption_materials_request)
 
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy")
-def test_GIVEN_valid_mpl_commitment_policy_WHEN_native_to_mpl_get_encryption_materials_THEN_returns_MPL_GetEncryptionMaterialsInput(
+
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._native_to_mpl_commmitment_policy")
+def test_GIVEN_valid_mpl_commitment_policy_WHEN_native_to_mpl_get_encryption_materials_THEN_returns_MPL_GetEncryptionMaterialsInput(  # noqa: E501
     mock_mpl_commitment_policy
 ):
     # Given: commitment policy is some MPL ESDK commitment policy
     mock_commitment_policy = MagicMock(__class__=MPL_CommitmentPolicyESDK)
     mock_mpl_commitment_policy.return_value = mock_commitment_policy
 
     # When: _native_to_mpl_get_encryption_materials
-    output = CryptoMaterialsManagerFromMPL._native_to_mpl_get_encryption_materials(mock_encryption_materials_request)
+    output = CryptoMaterialsManagerFromMPL._native_to_mpl_get_encryption_materials(
+        mock_encryption_materials_request
+    )
 
     # Then: returned MPL_GetEncryptionMaterialsInput is correct
     assert isinstance(output, MPL_GetEncryptionMaterialsInput)
@@ -135,7 +141,7 @@ def test_GIVEN_valid_mpl_commitment_policy_WHEN_native_to_mpl_get_encryption_mat
     assert output.max_plaintext_length == mock_encryption_materials_request.plaintext_length
 
 
-def test_GIVEN_CommitmentPolicy_FORBID_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_FORBID_ENCRYPT_ALLOW_DECRYPT():
+def test_GIVEN_CommitmentPolicy_FORBID_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_FORBID_ENCRYPT_ALLOW_DECRYPT():  # noqa: E501
     # Given: native FORBID_ENCRYPT_ALLOW_DECRYPT
     native_commitment_policy = CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT
 
@@ -146,7 +152,8 @@ def test_GIVEN_CommitmentPolicy_FORBID_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_
     assert isinstance(output, MPL_CommitmentPolicyESDK)
     assert output.value == "FORBID_ENCRYPT_ALLOW_DECRYPT"
 
-def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_REQUIRE_ENCRYPT_ALLOW_DECRYPT():
+
+def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_REQUIRE_ENCRYPT_ALLOW_DECRYPT():  # noqa: E501
     # Given: native REQUIRE_ENCRYPT_ALLOW_DECRYPT
     native_commitment_policy = CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT
 
@@ -157,7 +164,8 @@ def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl
     assert isinstance(output, MPL_CommitmentPolicyESDK)
     assert output.value == "REQUIRE_ENCRYPT_ALLOW_DECRYPT"
 
-def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_REQUIRE_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_REQUIRE_ENCRYPT_REQUIRE_DECRYPT():
+
+def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_REQUIRE_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_REQUIRE_ENCRYPT_REQUIRE_DECRYPT():  # noqa: E501
     # Given: native REQUIRE_ENCRYPT_REQUIRE_DECRYPT
     native_commitment_policy = CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
 
@@ -168,6 +176,7 @@ def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_REQUIRE_DECRYPT_WHEN_native_to_m
     assert isinstance(output, MPL_CommitmentPolicyESDK)
     assert output.value == "REQUIRE_ENCRYPT_REQUIRE_DECRYPT"
 
+
 def test_GIVEN_CommitmentPolicy_unrecognized_WHEN_native_to_mpl_commmitment_policy_THEN_raise_ValueError():
     # Given: invalid native commitment policy
     native_commitment_policy = "not a commitment policy"
@@ -177,13 +186,14 @@ def test_GIVEN_CommitmentPolicy_unrecognized_WHEN_native_to_mpl_commmitment_poli
         # When: _native_to_mpl_commmitment_policy
         CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(native_commitment_policy)
 
+
 @patch.object(mock_mpl_cmm, "decrypt_materials")
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._create_mpl_decrypt_materials_input_from_request")
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._create_mpl_decrypt_materials_input_from_request")
 def test_GIVEN_valid_request_WHEN_decrypt_materials_THEN_return_DecryptionMaterialsFromMPL(
     mock_native_to_mpl_decrypt_materials,
     mock_get_encryption_materials,
 ):
-    
     # Given: mpl_cmm.get_decryption_materials returns mock MPL decryption materials
     mock_decrypt_materials_output = MagicMock(__class__=MPL_GetEncryptionMaterialsOutput)
     mock_decrypt_materials_output.decryption_materials = mock_mpl_decrypt_materials
@@ -205,20 +215,23 @@ def test_GIVEN_valid_request_WHEN_decrypt_materials_THEN_return_DecryptionMateri
     # Verify we actually called `decrypt_materials`
     mock_mpl_cmm.decrypt_materials.assert_called_once_with(mock_decrypt_materials_input)
 
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._create_mpl_decrypt_materials_input_from_request")
+
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._create_mpl_decrypt_materials_input_from_request")
 def test_GIVEN_decrypt_materials_raises_MPL_Exception_WHEN_call_decrypt_materials_THEN_raise_ESDK_Exception(
     _
 ):
     # Then: Raises AWSEncryptionSDKClientError
     with pytest.raises(AWSEncryptionSDKClientError):
         # Given: mpl_cmm.decrypt_materials raises MPL exception
         with patch.object(mock_mpl_cmm, "decrypt_materials",
-                        side_effect=AwsCryptographicMaterialProvidersException("any")):
+                          side_effect=AwsCryptographicMaterialProvidersException("any")):
             # When: decrypt_materials
             cmm = CryptoMaterialsManagerFromMPL(mpl_cmm=mock_mpl_cmm)
             cmm.decrypt_materials(mock_decryption_materials_request)
 
-def test_GIVEN_valid_native_algorithm_id_WHEN_native_algorithm_id_to_mpl_algorithm_id_THEN_returns_valid_MPL_AlgorithmSuiteIdESDK():
+
+def test_GIVEN_valid_native_algorithm_id_WHEN_native_algorithm_id_to_mpl_algorithm_id_THEN_returns_valid_MPL_AlgorithmSuiteIdESDK():  # noqa: E501
     # Given: any native algorithm ID
     some_native_algorithm_id = 0x1234  # Not a real algorithm ID, but fits the format
 
@@ -231,9 +244,12 @@ def test_GIVEN_valid_native_algorithm_id_WHEN_native_algorithm_id_to_mpl_algorit
     assert isinstance(mpl_output, MPL_AlgorithmSuiteIdESDK)
     assert mpl_output.value == "0x1234"
 
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._native_algorithm_id_to_mpl_algorithm_id")
-@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy")
-def test_GIVEN_valid_request_WHEN_create_mpl_decrypt_materials_input_from_request_THEN_returns_MPL_MPL_DecryptMaterialsInput(
+
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._native_algorithm_id_to_mpl_algorithm_id")
+@patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
+       "._native_to_mpl_commmitment_policy")
+def test_GIVEN_valid_request_WHEN_create_mpl_decrypt_materials_input_from_request_THEN_returns_MPL_MPL_DecryptMaterialsInput(  # noqa: E501
     mock_mpl_commitment_policy,
     mock_mpl_algorithm_id,
 ):
@@ -245,17 +261,19 @@ def test_GIVEN_valid_request_WHEN_create_mpl_decrypt_materials_input_from_reques
     mock_commitment_policy = MagicMock(__class__=MPL_CommitmentPolicyESDK)
     mock_mpl_commitment_policy.return_value = mock_commitment_policy
 
-    no_mock_edks = [ mock_edk ]
-    one_mock_edk = [ mock_edk ]
-    two_mock_edks = [ mock_edk, mock_edk ]
+    no_mock_edks = [mock_edk]
+    one_mock_edk = [mock_edk]
+    two_mock_edks = [mock_edk, mock_edk]
 
     # Given: ESK lists of various lengths
-    for mock_edks in [ no_mock_edks, one_mock_edk, two_mock_edks ]:
+    for mock_edks in [no_mock_edks, one_mock_edk, two_mock_edks]:
 
         mock_decryption_materials_request.encrypted_data_keys = mock_edks
 
         # When: _create_mpl_decrypt_materials_input_from_request
-        output = CryptoMaterialsManagerFromMPL._create_mpl_decrypt_materials_input_from_request(mock_decryption_materials_request)
+        output = CryptoMaterialsManagerFromMPL._create_mpl_decrypt_materials_input_from_request(
+            mock_decryption_materials_request
+        )
 
         # Then:
         # Verify general correctness of output structure
@@ -273,4 +291,4 @@ def test_GIVEN_valid_request_WHEN_create_mpl_decrypt_materials_input_from_reques
             input_edk = mock_edks[i]
             assert output_edk.key_provider_id == input_edk.key_provider.provider_id
             assert output_edk.key_provider_info == input_edk.key_provider.key_info
-            assert output_edk.ciphertext == input_edk.encrypted_data_key
+            assert output_edk.ciphertext == input_edk.encrypted_data_key

test/mpl/unit/test_material_managers_mpl_materials.py

@@ -22,10 +22,10 @@
     EncryptionMaterials as MPL_EncryptionMaterials,
 )
 from mock import MagicMock, patch
-from typing import Dict, List, Set
+from typing import Dict
 
 import aws_encryption_sdk.materials_managers.mpl.materials
-from aws_encryption_sdk.identifiers import Algorithm, AlgorithmSuite
+from aws_encryption_sdk.identifiers import AlgorithmSuite
 from aws_encryption_sdk.materials_managers import DecryptionMaterialsRequest, EncryptionMaterialsRequest
 from aws_encryption_sdk.materials_managers.mpl.materials import DecryptionMaterialsFromMPL, EncryptionMaterialsFromMPL
 
@@ -48,11 +48,11 @@
 mock_edk.ciphertext = mock_mpl_ciphertext
 
 
-def test_GIVEN_valid_mpl_materials_WHEN_create_EncryptionMaterialsFromMPL_THEN_return_new_CryptoMaterialsManagerFromMPL():
+def test_GIVEN_mpl_materials_WHEN_create_EncryptionMaterialsFromMPL_THEN_return_new_CryptoMaterialsManagerFromMPL():
     # Given: valid mpl_materials
     # When: create EncryptionMaterialsFromMPL
     mpl_encryption_materials = EncryptionMaterialsFromMPL(mpl_materials=mock_mpl_encryption_materials)
-    
+
     # Then: EncryptionMaterialsFromMPL is valid
     assert mpl_encryption_materials.mpl_materials == mock_mpl_encryption_materials
 
@@ -93,7 +93,7 @@ def test_GIVEN_valid_mpl_algorithm_id_WHEN_EncryptionMaterials_get_algorithm_THE
     # When: Get algorithm
     mpl_encryption_materials = EncryptionMaterialsFromMPL(mpl_materials=mock_mpl_encryption_materials)
     output = mpl_encryption_materials.algorithm
-    
+
     # Then: output is valid
     assert output == mock_algorithm()  # property calls automatically, we need to call the mock
 
@@ -112,12 +112,12 @@ def test_GIVEN_valid_encryption_context_WHEN_EncryptionMaterials_get_encryption_
 
 
 def test_GIVEN_valid_edks_WHEN_EncryptionMaterials_get_edks_THEN_returns_edks():
-    
+
     # Given: lists of mocked EDKs of various lengths
     no_mock_edks = []
-    one_mock_edk = [ mock_edk ]
-    two_mocked_edks = [ mock_edk, mock_edk ]
-    for mock_edks in [ no_mock_edks, one_mock_edk, two_mocked_edks ]:
+    one_mock_edk = [mock_edk]
+    two_mocked_edks = [mock_edk, mock_edk]
+    for mock_edks in [no_mock_edks, one_mock_edk, two_mocked_edks]:
         mock_mpl_encryption_materials.encrypted_data_keys = mock_edks
 
         # When: get EDKs