fix cb

Author: lucasmcdonald3

src/aws_encryption_sdk/materials_managers/mpl/cmm.py

@@ -78,18 +78,21 @@ def get_encryption_materials(
     def _native_to_mpl_get_encryption_materials(
         request: EncryptionMaterialsRequest
     ) -> 'MPL_GetEncryptionMaterialsInput':
-        commitment_policy = CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(
+        commitment_policy = CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(
             request.commitment_policy
         )
         output: MPL_GetEncryptionMaterialsInput = MPL_GetEncryptionMaterialsInput(
             encryption_context=request.encryption_context,
             commitment_policy=commitment_policy,
+            algorithm_suite_id=CryptoMaterialsManagerFromMPL._native_algorithm_id_to_mpl_algorithm_id(
+                request.algorithm.algorithm_id
+            ),
             max_plaintext_length=request.plaintext_length,
         )
         return output
 
     @staticmethod
-    def _native_to_mpl_commmitment_policy(
+    def _native_to_mpl_commitment_policy(
         native_commitment_policy: CommitmentPolicy
     ) -> 'MPL_CommitmentPolicyESDK':
         if native_commitment_policy == CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT:
@@ -138,7 +141,7 @@ def _create_mpl_decrypt_materials_input_from_request(
             algorithm_suite_id=CryptoMaterialsManagerFromMPL._native_algorithm_id_to_mpl_algorithm_id(
                 request.algorithm.algorithm_id
             ),
-            commitment_policy=CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(
+            commitment_policy=CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(
                 request.commitment_policy
             ),
             encrypted_data_keys=list_edks,

test/mpl/unit/test_material_managers_mpl_cmm.py

@@ -97,7 +97,7 @@ def test_GIVEN_valid_request_WHEN_get_encryption_materials_THEN_return_Encryptio
 
 
 @patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
-       "._native_to_mpl_commmitment_policy")
+       "._native_to_mpl_commitment_policy")
 def test_GIVEN_mpl_cmm_raises_MPLException_WHEN_get_encryption_materials_THEN_raise_ESDKException(
     _
 ):
@@ -112,7 +112,7 @@ def test_GIVEN_mpl_cmm_raises_MPLException_WHEN_get_encryption_materials_THEN_ra
 
 
 @patch("aws_encryption_sdk.materials_managers.mpl.cmm.CryptoMaterialsManagerFromMPL"
-       "._native_to_mpl_commmitment_policy")
+       "._native_to_mpl_commitment_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
 ):
@@ -132,50 +132,50 @@ 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():  # noqa: E501
+def test_GIVEN_CommitmentPolicy_FORBID_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commitment_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
 
-    # When: _native_to_mpl_commmitment_policy
-    output = CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(native_commitment_policy)
+    # When: _native_to_mpl_commitment_policy
+    output = CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(native_commitment_policy)
 
     # Then: Returns MPL FORBID_ENCRYPT_ALLOW_DECRYPT
     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():  # noqa: E501
+def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commitment_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
 
-    # When: _native_to_mpl_commmitment_policy
-    output = CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(native_commitment_policy)
+    # When: _native_to_mpl_commitment_policy
+    output = CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(native_commitment_policy)
 
     # Then: Returns MPL REQUIRE_ENCRYPT_ALLOW_DECRYPT
     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():  # noqa: E501
+def test_GIVEN_CommitmentPolicy_REQUIRE_ENCRYPT_REQUIRE_DECRYPT_WHEN_native_to_mpl_commitment_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
 
-    # When: _native_to_mpl_commmitment_policy
-    output = CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(native_commitment_policy)
+    # When: _native_to_mpl_commitment_policy
+    output = CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(native_commitment_policy)
 
     # Then: Returns MPL REQUIRE_ENCRYPT_REQUIRE_DECRYPT
     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():
+def test_GIVEN_CommitmentPolicy_unrecognized_WHEN_native_to_mpl_commitment_policy_THEN_raise_ValueError():
     # Given: invalid native commitment policy
     native_commitment_policy = "not a commitment policy"
 
     # Then: Raises ValueError
     with pytest.raises(ValueError):
-        # When: _native_to_mpl_commmitment_policy
-        CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(native_commitment_policy)
+        # When: _native_to_mpl_commitment_policy
+        CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(native_commitment_policy)
 
 
 @patch.object(mock_mpl_cmm, "decrypt_materials")
@@ -239,7 +239,7 @@ def test_GIVEN_valid_native_algorithm_id_WHEN_native_algorithm_id_to_mpl_algorit
 @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")
+       "._native_to_mpl_commitment_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,
@@ -248,7 +248,7 @@ def test_GIVEN_valid_request_WHEN_create_mpl_decrypt_materials_input_from_reques
     mock_algorithm_id = "0x1234"  # Some fake algorithm ID that fits the format
     mock_mpl_algorithm_id.return_value = mock_algorithm_id
 
-    # Given: _native_to_mpl_commmitment_policy returns some MPL commitment policy
+    # Given: _native_to_mpl_commitment_policy returns some MPL commitment policy
     mock_commitment_policy = MagicMock(__class__=MPL_CommitmentPolicyESDK)
     mock_mpl_commitment_policy.return_value = mock_commitment_policy