From e831419e1fac306c6a4d3fd410fd3e51e1105c01 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 4 Sep 2024 13:43:19 -0700 Subject: [PATCH 01/12] chore: Refer to renamed MPL libraries --- performance_tests/requirements_mpl.txt | 2 +- requirements_mpl.txt | 2 +- setup.py | 2 +- test_vector_handlers/requirements_mpl.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/performance_tests/requirements_mpl.txt b/performance_tests/requirements_mpl.txt index 28d7dc356..05107aa0a 100644 --- a/performance_tests/requirements_mpl.txt +++ b/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-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file diff --git a/requirements_mpl.txt b/requirements_mpl.txt index 28d7dc356..05107aa0a 100644 --- a/requirements_mpl.txt +++ b/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file diff --git a/setup.py b/setup.py index c069bade1..ebb875da8 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def get_requirements(): # TODO-MPL: Point at PyPI once MPL is released. # This blocks releasing ESDK-Python MPL integration. extras_require={ - "MPL": ["aws-cryptographic-material-providers @" \ + "MPL": ["aws-cryptographic-materialproviders @" \ "git+https://github.com/aws/aws-cryptographic-material-providers-library.git@" \ "lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"], }, diff --git a/test_vector_handlers/requirements_mpl.txt b/test_vector_handlers/requirements_mpl.txt index 1aab5f534..37626dc0f 100644 --- a/test_vector_handlers/requirements_mpl.txt +++ b/test_vector_handlers/requirements_mpl.txt @@ -1 +1 @@ -amazon-cryptographic-material-providers-test-vectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptography-internal-mpl-testvectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file From fbca0c85ea59c90687191504a4bd6b36153bca83 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 4 Sep 2024 13:50:56 -0700 Subject: [PATCH 02/12] use branch with dafny --- performance_tests/requirements_mpl.txt | 2 +- requirements_mpl.txt | 2 +- setup.py | 2 +- test_vector_handlers/requirements_mpl.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/performance_tests/requirements_mpl.txt b/performance_tests/requirements_mpl.txt index 05107aa0a..d9744a723 100644 --- a/performance_tests/requirements_mpl.txt +++ b/performance_tests/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file diff --git a/requirements_mpl.txt b/requirements_mpl.txt index 05107aa0a..d9744a723 100644 --- a/requirements_mpl.txt +++ b/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file diff --git a/setup.py b/setup.py index ebb875da8..3af72f984 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def get_requirements(): extras_require={ "MPL": ["aws-cryptographic-materialproviders @" \ "git+https://github.com/aws/aws-cryptographic-material-providers-library.git@" \ - "lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"], + "python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"], }, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/test_vector_handlers/requirements_mpl.txt b/test_vector_handlers/requirements_mpl.txt index 37626dc0f..6cffc62e6 100644 --- a/test_vector_handlers/requirements_mpl.txt +++ b/test_vector_handlers/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptography-internal-mpl-testvectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptography-internal-mpl-testvectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file From 3bbd641367bec30baea70b3308d2b78187d1a007 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 4 Sep 2024 15:25:39 -0700 Subject: [PATCH 03/12] Update requirements_mpl.txt --- requirements_mpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_mpl.txt b/requirements_mpl.txt index d9744a723..210704604 100644 --- a/requirements_mpl.txt +++ b/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python \ No newline at end of file +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python From 2bda6320244d27134eea1faee13f9eb34619fb2b Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 4 Sep 2024 15:25:50 -0700 Subject: [PATCH 04/12] Update requirements_mpl.txt --- requirements_mpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_mpl.txt b/requirements_mpl.txt index 210704604..5cbdb37a1 100644 --- a/requirements_mpl.txt +++ b/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python From 1730a0d5f9a07ff150050105f01cafb0ec5a5f2a Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 4 Sep 2024 15:30:02 -0700 Subject: [PATCH 05/12] Update requirements_mpl.txt --- requirements_mpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_mpl.txt b/requirements_mpl.txt index 5cbdb37a1..210704604 100644 --- a/requirements_mpl.txt +++ b/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python From fb457ac84569861c87f444b1dc209ac763429cea Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 4 Sep 2024 15:30:10 -0700 Subject: [PATCH 06/12] Update requirements_mpl.txt --- requirements_mpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_mpl.txt b/requirements_mpl.txt index 210704604..5cbdb37a1 100644 --- a/requirements_mpl.txt +++ b/requirements_mpl.txt @@ -1 +1 @@ -aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python +aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python From 2386ea919582e8b1e424a96971c256cd8d7d1fcf Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 5 Sep 2024 08:56:24 -0700 Subject: [PATCH 07/12] debug --- .../src/awses_test_vectors/commands/full_message_decrypt.py | 3 ++- .../commands/full_message_decrypt_generate.py | 3 ++- .../src/awses_test_vectors/commands/full_message_encrypt.py | 3 ++- .../src/awses_test_vectors/manifests/full_message/decrypt.py | 3 ++- .../manifests/full_message/decrypt_generation.py | 3 ++- .../src/awses_test_vectors/manifests/full_message/encrypt.py | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py index d1e7a6811..7fc45461d 100644 --- a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py @@ -8,7 +8,8 @@ try: import aws_cryptographic_materialproviders # noqa pylint: disable=unused-import,import-error _HAS_MPL = True -except ImportError: +except ImportError as e: + print(e) _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py index 49f2647fa..a7e20bf5d 100644 --- a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py +++ b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py @@ -8,7 +8,8 @@ try: import aws_cryptographic_materialproviders # noqa pylint: disable=unused-import,import-error _HAS_MPL = True -except ImportError: +except ImportError as e: + print(e) _HAS_MPL = False try: # Python 3.5.0 and 3.5.1 have incompatible typing modules diff --git a/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py b/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py index ba7579e6f..182786168 100644 --- a/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py @@ -8,7 +8,8 @@ try: import aws_cryptographic_materialproviders # noqa pylint: disable=unused-import,import-error _HAS_MPL = True -except ImportError: +except ImportError as e: + print(e) _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py index 79df4f2cf..9953deadb 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py @@ -38,7 +38,8 @@ ) _HAS_MPL = True -except ImportError: +except ImportError as e: + print(e) _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py index 63f8b8ff3..5fa4ff4ce 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py @@ -41,7 +41,8 @@ ) _HAS_MPL = True -except ImportError: +except ImportError as e: + print(e) _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py index 81581fa8e..be1abddb4 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py @@ -40,7 +40,8 @@ from awses_test_vectors.manifests.mpl_keyring import KeyringSpec, keyring_from_master_key_specs _HAS_MPL = True -except ImportError: +except ImportError as e: + print(e) _HAS_MPL = False From 3855a95198d91e3bcca848232b3696bfa280f63a Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 5 Sep 2024 09:01:10 -0700 Subject: [PATCH 08/12] debug --- .../internal/mpl/keyvectors_provider.py | 8 ++++---- .../src/awses_test_vectors/manifests/mpl_keyring.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py index 305459026..5739ec83a 100644 --- a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py +++ b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py @@ -1,12 +1,12 @@ """Singleton provider for the KeyVectors client.""" # # Ignore missing MPL TestVectors for pylint, but the MPL TestVectors is required for this file # pylint: disable=import-error -from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\ - aws_cryptography_materialproviderstestvectorkeys.client import ( +from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ + aws_cryptography_materialproviders_test_vectors.client import ( KeyVectors, ) -from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\ - aws_cryptography_materialproviderstestvectorkeys.config import ( +from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ + aws_cryptography_materialproviders_test_vectors.config import ( KeyVectorsConfig ) diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py index dbabeb3c7..c0281017b 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py @@ -19,8 +19,8 @@ # Ignore missing MPL for pylint, but the MPL is required for this example # noqa pylint: disable=import-error -from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\ - aws_cryptography_materialproviderstestvectorkeys.models import ( +from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ + aws_cryptography_materialproviders_test_vectors.models import ( GetKeyDescriptionInput, GetKeyDescriptionOutput, TestVectorKeyringInput, From af273441e329a8f20802271feacd174dbb00216d Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 5 Sep 2024 09:05:34 -0700 Subject: [PATCH 09/12] debug --- .../awses_test_vectors/internal/mpl/keyvectors_provider.py | 4 ++-- .../src/awses_test_vectors/manifests/mpl_keyring.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py index 5739ec83a..90581182c 100644 --- a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py +++ b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py @@ -2,11 +2,11 @@ # # Ignore missing MPL TestVectors for pylint, but the MPL TestVectors is required for this file # pylint: disable=import-error from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ - aws_cryptography_materialproviders_test_vectors.client import ( + aws_cryptography_materialproviderstestvectorkeys.client import ( KeyVectors, ) from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ - aws_cryptography_materialproviders_test_vectors.config import ( + aws_cryptography_materialproviderstestvectorkeys.config import ( KeyVectorsConfig ) diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py index c0281017b..1fa0d4c3f 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py @@ -20,7 +20,7 @@ # Ignore missing MPL for pylint, but the MPL is required for this example # noqa pylint: disable=import-error from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ - aws_cryptography_materialproviders_test_vectors.models import ( + aws_cryptography_materialproviderstestvectorkeys.models import ( GetKeyDescriptionInput, GetKeyDescriptionOutput, TestVectorKeyringInput, From b8eeeea88a4294626a7236e15fc43542925d5ba7 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 5 Sep 2024 09:08:58 -0700 Subject: [PATCH 10/12] debug --- .../src/awses_test_vectors/manifests/mpl_keyring.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py index 1fa0d4c3f..f2ea05559 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py +++ b/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 -from standard_library.internaldafny.generated import UTF8 +from smithy_dafny_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 From 1bab03e4c5b14c54c3d716a4f70f502146c939da Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 5 Sep 2024 09:16:34 -0700 Subject: [PATCH 11/12] debug --- .../src/awses_test_vectors/internal/mpl/keyvectors_provider.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py index 90581182c..b6312cb7b 100644 --- a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py +++ b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py @@ -7,7 +7,7 @@ ) from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ aws_cryptography_materialproviderstestvectorkeys.config import ( - KeyVectorsConfig + KeyVectorsConfig ) keyvectors_instances = {} From cdad5962da24cacc76fbf8589c0aaaffefb25d47 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 5 Sep 2024 09:34:05 -0700 Subject: [PATCH 12/12] m --- .../src/awses_test_vectors/commands/full_message_decrypt.py | 3 +-- .../commands/full_message_decrypt_generate.py | 3 +-- .../src/awses_test_vectors/commands/full_message_encrypt.py | 3 +-- .../src/awses_test_vectors/internal/mpl/keyvectors_provider.py | 2 +- .../src/awses_test_vectors/manifests/full_message/decrypt.py | 3 +-- .../manifests/full_message/decrypt_generation.py | 3 +-- .../src/awses_test_vectors/manifests/full_message/encrypt.py | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py index 7fc45461d..d1e7a6811 100644 --- a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt.py @@ -8,8 +8,7 @@ try: import aws_cryptographic_materialproviders # noqa pylint: disable=unused-import,import-error _HAS_MPL = True -except ImportError as e: - print(e) +except ImportError: _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py index a7e20bf5d..49f2647fa 100644 --- a/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py +++ b/test_vector_handlers/src/awses_test_vectors/commands/full_message_decrypt_generate.py @@ -8,8 +8,7 @@ try: import aws_cryptographic_materialproviders # noqa pylint: disable=unused-import,import-error _HAS_MPL = True -except ImportError as e: - print(e) +except ImportError: _HAS_MPL = False try: # Python 3.5.0 and 3.5.1 have incompatible typing modules diff --git a/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py b/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py index 182786168..ba7579e6f 100644 --- a/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/commands/full_message_encrypt.py @@ -8,8 +8,7 @@ try: import aws_cryptographic_materialproviders # noqa pylint: disable=unused-import,import-error _HAS_MPL = True -except ImportError as e: - print(e) +except ImportError: _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py index b6312cb7b..90581182c 100644 --- a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py +++ b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py @@ -7,7 +7,7 @@ ) from aws_cryptography_materialproviders_test_vectors.smithygenerated.\ aws_cryptography_materialproviderstestvectorkeys.config import ( - KeyVectorsConfig + KeyVectorsConfig ) keyvectors_instances = {} diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py index 9953deadb..79df4f2cf 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py @@ -38,8 +38,7 @@ ) _HAS_MPL = True -except ImportError as e: - print(e) +except ImportError: _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py index 5fa4ff4ce..63f8b8ff3 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py @@ -41,8 +41,7 @@ ) _HAS_MPL = True -except ImportError as e: - print(e) +except ImportError: _HAS_MPL = False diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py index be1abddb4..81581fa8e 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py @@ -40,8 +40,7 @@ from awses_test_vectors.manifests.mpl_keyring import KeyringSpec, keyring_from_master_key_specs _HAS_MPL = True -except ImportError as e: - print(e) +except ImportError: _HAS_MPL = False