lint

Author: lucasmcdonald3

src/aws_encryption_sdk/streaming_client.py

@@ -976,7 +976,7 @@ def _create_decrypt_materials_request(self, header):
             encryption_context=header.encryption_context,
             commitment_policy=self.config.commitment_policy,
         )
-    
+
     def _validate_parsed_header(
         self,
         header,
@@ -1096,7 +1096,7 @@ def _read_header(self):
                     "Key commitment validation failed. Key identity does not match the identity asserted in the "
                     "message. Halting processing of this message."
                 )
-            
+
         return self._validate_parsed_header(
             header=header,
             header_auth=header_auth,

test/mpl/unit/test_material_managers_mpl_materials.py

@@ -160,7 +160,7 @@ def test_GIVEN_valid_signing_key_WHEN_EncryptionMaterials_get_signing_key_THEN_r
     assert output == mock_signing_key
 
 
-def test_GIVEN_valid_required_encryption_context_keys_WHEN_EncryptionMaterials_get_required_encryption_context_keys_THEN_returns_required_encryption_context_keys():
+def test_GIVEN_valid_required_encryption_context_keys_WHEN_EncryptionMaterials_get_required_encryption_context_keys_THEN_returns_required_encryption_context_keys():  # noqa pylint: disable=line-too-long
     # Given: valid required encryption context keys
     mock_required_encryption_context_keys = MagicMock(__class__=bytes)
     mock_mpl_encryption_materials.required_encryption_context_keys = mock_required_encryption_context_keys
@@ -202,7 +202,7 @@ def test_GIVEN_valid_verification_key_WHEN_DecryptionMaterials_get_verification_
     assert output == mock_verification_key
 
 
-def test_GIVEN_valid_encryption_context_WHEN_DecryptionMaterials_get_encryption_context_THEN_returns_encryption_context():
+def test_GIVEN_valid_encryption_context_WHEN_DecryptionMaterials_get_encryption_context_THEN_returns_encryption_context():  # noqa pylint: disable=line-too-long
     # Given: valid encryption context
     mock_encryption_context = MagicMock(__class__=Dict[str, str])
     mock_mpl_decrypt_materials.encryption_context = mock_encryption_context
@@ -215,7 +215,7 @@ def test_GIVEN_valid_encryption_context_WHEN_DecryptionMaterials_get_encryption_
     assert output == mock_encryption_context
 
 
-def test_GIVEN_valid_required_encryption_context_keys_WHEN_DecryptionMaterials_get_required_encryption_context_keys_THEN_returns_required_encryption_context_keys():
+def test_GIVEN_valid_required_encryption_context_keys_WHEN_DecryptionMaterials_get_required_encryption_context_keys_THEN_returns_required_encryption_context_keys():  # noqa pylint: disable=line-too-long
     # Given: valid required encryption context keys
     mock_required_encryption_context_keys = MagicMock(__class__=bytes)
     mock_mpl_decrypt_materials.required_encryption_context_keys = mock_required_encryption_context_keys

test/unit/test_serialize.py

@@ -169,7 +169,10 @@ def test_serialize_header_auth_v1_no_signer(self):
         )
 
     @patch("aws_encryption_sdk.internal.formatting.serialize.header_auth_iv")
-    def test_GIVEN_required_ec_bytes_WHEN_serialize_header_auth_v1_THEN_aad_has_required_ec_bytes(self, mock_header_auth_iv):
+    def test_GIVEN_required_ec_bytes_WHEN_serialize_header_auth_v1_THEN_aad_has_required_ec_bytes(
+        self,
+        mock_header_auth_iv,
+    ):
         """Validate that the _create_header_auth function
         behaves as expected for SerializationVersion.V1
         when required_ec_bytes are provided.
@@ -230,7 +233,10 @@ def test_serialize_header_auth_v2_no_signer(self):
         )
 
     @patch("aws_encryption_sdk.internal.formatting.serialize.header_auth_iv")
-    def test_GIVEN_required_ec_bytes_WHEN_serialize_header_auth_v2_THEN_aad_has_required_ec_bytes(self, mock_header_auth_iv):
+    def test_GIVEN_required_ec_bytes_WHEN_serialize_header_auth_v2_THEN_aad_has_required_ec_bytes(
+        self,
+        mock_header_auth_iv,
+    ):
         """Validate that the _create_header_auth function
         behaves as expected for SerializationVersion.V2.
         """

test/unit/test_streaming_client_stream_decryptor.py

@@ -11,6 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Unit test suite for aws_encryption_sdk.streaming_client.StreamDecryptor"""
+# noqa pylint: disable=too-many-lines
 import io
 
 import pytest
@@ -1011,7 +1012,7 @@ def test_GIVEN_config_has_EC_WHEN_create_decrypt_materials_request_THEN_provide_
         assert hasattr(output, "reproduced_encryption_context")
         assert output.reproduced_encryption_context == mock_reproduced_encryption_context
 
-    def test_GIVEN_config_does_not_have_EC_WHEN_create_decrypt_materials_request_THEN_request_does_not_have_reproduced_EC(
+    def test_GIVEN_config_does_not_have_EC_WHEN_create_decrypt_materials_request_THEN_request_does_not_have_reproduced_EC(  # noqa pylint: disable=line-too-long
         self,
     ):
         self.mock_header.content_type = ContentType.FRAMED_DATA
@@ -1066,7 +1067,7 @@ def test_GIVEN_materials_has_no_required_encryption_context_keys_attr_WHEN_read_
     @patch("aws_encryption_sdk.streaming_client.derive_data_encryption_key")
     @patch("aws_encryption_sdk.streaming_client.DecryptionMaterialsRequest")
     @patch("aws_encryption_sdk.streaming_client.Verifier")
-    def test_GIVEN_materials_has_required_encryption_context_keys_attr_WHEN_read_header_THEN_creates_correct_required_EC(
+    def test_GIVEN_materials_has_required_encryption_context_keys_attr_WHEN_read_header_THEN_creates_correct_required_EC(  # noqa pylint: disable=line-too-long
         self,
         mock_verifier,
         *_
@@ -1106,9 +1107,9 @@ def test_GIVEN_materials_has_required_encryption_context_keys_attr_WHEN_read_hea
             # Given: decryption_materials has required_encryption_context_keys
             self.mock_decrypt_materials.required_encryption_context_keys = \
                 required_encryption_context_keys
-            
+
             for encryption_context in encryption_context_values:
-                
+
                 self.mock_decrypt_materials.encryption_context = encryption_context
 
                 mock_verifier_instance = MagicMock()
@@ -1130,6 +1131,7 @@ def test_GIVEN_materials_has_required_encryption_context_keys_attr_WHEN_read_hea
                     if k in required_encryption_context_keys:
                         # ... its EC is in the StreamEncryptor._required_encryption_context
                         assert k in test_decryptor._required_encryption_context
+                        assert test_decryptor._required_encryption_context[k] == encryption_context[k]
                     # If a key is NOT in required_encryption_context_keys, then ...
                     else:
                         # ... its EC is NOT in the StreamEncryptor._required_encryption_context

test/unit/test_streaming_client_stream_encryptor.py

@@ -11,6 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Unit test suite for aws_encryption_sdk.streaming_client.StreamEncryptor"""
+# noqa pylint: disable=too-many-lines
 import io
 
 import pytest
@@ -453,7 +454,9 @@ def test_GIVEN_has_mpl_AND_has_MPLCMM_AND_uses_signer_WHEN_prep_message_THEN_sig
 
     # Given: has MPL
     @pytest.mark.skipif(not HAS_MPL, reason="Test should only be executed with MPL in installation")
-    def test_GIVEN_has_mpl_AND_encryption_materials_has_required_EC_keys_WHEN_prep_message_THEN_paritions_stored_and_required_EC(self):
+    def test_GIVEN_has_mpl_AND_encryption_materials_has_required_EC_keys_WHEN_prep_message_THEN_paritions_stored_and_required_EC(  # noqa pylint: disable=line-too-long
+        self
+    ):
         # Create explicit values to explicitly test logic in smaller cases
         required_encryption_context_keys_values = [
             # Case of empty encryption context list is not allowed;
@@ -492,7 +495,7 @@ def test_GIVEN_has_mpl_AND_encryption_materials_has_required_EC_keys_WHEN_prep_m
             # Given: encryption context has required_encryption_context_keys
             self.mock_encryption_materials.required_encryption_context_keys = \
                 required_encryption_context_keys
-            
+
             for encryption_context in encryption_context_values:
                 self.mock_encryption_materials.encryption_context = encryption_context
 
@@ -514,6 +517,7 @@ def test_GIVEN_has_mpl_AND_encryption_materials_has_required_EC_keys_WHEN_prep_m
                     if k in required_encryption_context_keys:
                         # 1) Its EC is in the StreamEncryptor._required_encryption_context
                         assert k in test_encryptor._required_encryption_context
+                        assert test_encryptor._required_encryption_context[k] == encryption_context[k]
                         # 2) Its EC is NOT in the StreamEncryptor._stored_encryption_context
                         assert k not in test_encryptor._stored_encryption_context
                     # If a key is NOT in required_encryption_context_keys, then
@@ -522,16 +526,19 @@ def test_GIVEN_has_mpl_AND_encryption_materials_has_required_EC_keys_WHEN_prep_m
                         assert k not in test_encryptor._required_encryption_context
                         # 2) Its EC is in the StreamEncryptor._stored_encryption_context
                         assert k in test_encryptor._stored_encryption_context
-                
+                        assert test_encryptor._stored_encryption_context[k] == encryption_context[k]
+
                 # Assert size(stored_EC) + size(required_EC) == size(EC)
                 # (i.e. every EC was sorted into one or the other)
                 assert len(test_encryptor._required_encryption_context) \
                     + len(test_encryptor._stored_encryption_context) \
                     == len(encryption_context)
-    
+
     # Given: has MPL
     @pytest.mark.skipif(not HAS_MPL, reason="Test should only be executed with MPL in installation")
-    def test_GIVEN_has_mpl_AND_encryption_materials_does_not_have_required_EC_keys_WHEN_prep_message_THEN_stored_EC_is_EC(self):
+    def test_GIVEN_has_mpl_AND_encryption_materials_does_not_have_required_EC_keys_WHEN_prep_message_THEN_stored_EC_is_EC(  # noqa pylint: disable=line-too-long
+        self
+    ):
 
         self.mock_encryption_materials.algorithm = Algorithm.AES_128_GCM_IV12_TAG16
 
@@ -557,7 +564,7 @@ def test_GIVEN_has_mpl_AND_encryption_materials_does_not_have_required_EC_keys_W
         assert test_encryptor._stored_encryption_context == mock_encryption_context
         # Then: _required_encryption_context is None
         assert test_encryptor._required_encryption_context is None
-                
+
     def test_prep_message_no_signer(self):
         self.mock_encryption_materials.algorithm = Algorithm.AES_128_GCM_IV12_TAG16
         test_encryptor = StreamEncryptor(