Merge pull request #299 from farleyb-amazon/import-fix

Fix missing import from top level module
aws · Sep 24, 2020 · 4b5ed7f · 4b5ed7f
2 parents 02b442f + 3159641
commit 4b5ed7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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:
+            aws_encryption_sdk.KMSMasterKeyProvider()
+        excinfo.match("KMSMasterKeyProvider is deprecated")