From 24c809ba68b60248b1d8dcb7e6d7011fe3e0807d Mon Sep 17 00:00:00 2001 From: Benjamin Farley Date: Thu, 24 Sep 2020 16:29:32 -0600 Subject: [PATCH 1/2] Fix missing import from top level module --- src/aws_encryption_sdk/__init__.py | 1 + test/unit/test_aws_encryption_sdk.py | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/aws_encryption_sdk/__init__.py b/src/aws_encryption_sdk/__init__.py index 12a5af531..36f7794b9 100644 --- a/src/aws_encryption_sdk/__init__.py +++ b/src/aws_encryption_sdk/__init__.py @@ -21,6 +21,7 @@ from aws_encryption_sdk.identifiers import Algorithm, CommitmentPolicy, __version__ # noqa from aws_encryption_sdk.key_providers.kms import ( # noqa DiscoveryAwsKmsMasterKeyProvider, + KMSMasterKeyProvider, KMSMasterKeyProviderConfig, StrictAwsKmsMasterKeyProvider, ) diff --git a/test/unit/test_aws_encryption_sdk.py b/test/unit/test_aws_encryption_sdk.py index dc3976b77..63e5532d0 100644 --- a/test/unit/test_aws_encryption_sdk.py +++ b/test/unit/test_aws_encryption_sdk.py @@ -101,3 +101,10 @@ def test_stream_deprecation_warning(self): with pytest.raises(DeprecationWarning) as excinfo: aws_encryption_sdk.stream(mode="e", source=sentinel.a, key_provider=sentinel.b) excinfo.match("This method is deprecated and will be removed in a future version") + + def test_kms_master_key_provider_deprecation_warning(self): + warnings.simplefilter("error") + + with pytest.raises(DeprecationWarning) as excinfo: + provider = aws_encryption_sdk.KMSMasterKeyProvider() + excinfo.match("KMSMasterKeyProvider is deprecated") From 3159641461adb97553187432c3c3911002791c18 Mon Sep 17 00:00:00 2001 From: Benjamin Farley Date: Thu, 24 Sep 2020 16:33:49 -0600 Subject: [PATCH 2/2] Fix pylint --- test/unit/test_aws_encryption_sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/test_aws_encryption_sdk.py b/test/unit/test_aws_encryption_sdk.py index 63e5532d0..4a601dd2d 100644 --- a/test/unit/test_aws_encryption_sdk.py +++ b/test/unit/test_aws_encryption_sdk.py @@ -106,5 +106,5 @@ def test_kms_master_key_provider_deprecation_warning(self): warnings.simplefilter("error") with pytest.raises(DeprecationWarning) as excinfo: - provider = aws_encryption_sdk.KMSMasterKeyProvider() + aws_encryption_sdk.KMSMasterKeyProvider() excinfo.match("KMSMasterKeyProvider is deprecated")