chore: Change MPL branch, remove PYTHONPATH workarounds (#683)

Author: lucasmcdonald3

examples/src/branch_key_id_supplier_example.py

@@ -25,15 +25,15 @@ def get_branch_key_id(
         """Returns branch key ID from the tenant ID in input's encryption context."""
         encryption_context: Dict[str, str] = param.encryption_context
 
-        if b"tenant" not in encryption_context:
+        if "tenant" not in encryption_context:
             raise ValueError("EncryptionContext invalid, does not contain expected tenant key value pair.")
 
-        tenant_key_id: str = encryption_context.get(b"tenant")
+        tenant_key_id: str = encryption_context.get("tenant")
         branch_key_id: str
 
-        if tenant_key_id == b"TenantA":
+        if tenant_key_id == "TenantA":
             branch_key_id = self.branch_key_id_for_tenant_A
-        elif tenant_key_id == b"TenantB":
+        elif tenant_key_id == "TenantB":
             branch_key_id = self.branch_key_id_for_tenant_B
         else:
             raise ValueError(f"Item does not contain valid tenant ID: {tenant_key_id=}")

examples/src/default_cryptographic_materials_manager_example.py

@@ -18,8 +18,6 @@
 For more information on Cryptographic Material Managers, see
 https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/concepts.html#crypt-materials-manager
 """
-import sys
-
 import boto3
 from aws_cryptographic_materialproviders.mpl import AwsCryptographicMaterialProviders
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
@@ -33,11 +31,6 @@
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
 
-# TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
-MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
-
-sys.path.append(MODULE_ROOT_DIR)
-
 EXAMPLE_DATA: bytes = b"Hello World"
 
 

performance_tests/requirements_mpl.txt

@@ -1 +1 @@
-aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
+aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python

test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py

@@ -8,6 +8,8 @@
 import json
 import os
 from enum import Enum
+import contextlib
+import io
 
 import attr
 import aws_encryption_sdk
@@ -126,8 +128,19 @@ def match(self, name, decrypt_fn):
             # The ESDK implementations are not consistent in the types of errors they produce
             # or the exact error messages they use. The most important thing to test is that decryption
             # fails in some way, and hence the overly-broad implicit try/catch here.
+
             with pytest.raises(Exception):
-                decrypt_fn()
+                # Here, an exception is expected.
+                # However, when the expected exception is raised,
+                # the Python environment will write stderrs to console.
+                # Redirect stderr to null-like sink
+                # so local and CI build logs are cleaner,
+                # and any actual issues are easier to see.
+                # If an exception is not raised as expected,
+                # `pytest.raises` will fail.
+                tmp_file = io.StringIO()
+                with contextlib.redirect_stderr(tmp_file):
+                    decrypt_fn()
         except BaseException:
             # Translate the exception just to attach context.
             raise RuntimeError(

test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py

@@ -31,7 +31,7 @@
 from aws_cryptographic_materialproviders.mpl.models import CreateMultiKeyringInput
 
 import _dafny
-import UTF8
+from standard_library.internaldafny.generated import UTF8
 
 # Ignore pylint not being able to read a module that requires the MPL
 # pylint: disable=no-name-in-module