remove deprecations

Author: lucasmcdonald3

README.rst

@@ -90,13 +90,13 @@ which is automatically generated anywhere a caller provides a keyring.
 
 Note: You must also install the `AWS Cryptographic Material Providers Library (MPL)`_
 to create and use CMMs that use keyrings.
-CMMs that use master key providers have been deprecated since v4 of this library.
+CMMs that use master key providers have been marked as legacy since v4 of this library.
 
 Legacy Concepts
 ===============
-These concepts mention components that have been deprecated since v4 of this library.
+This section describes legacy concepts used in earlier versions of this library.
 These components have been superseded by new components in the `AWS Cryptographic Material Providers Library (MPL)`_.
-Please avoid using these and instead use components in the MPL.
+Please avoid using these components, and instead use components in the MPL.
 
 Master Key Providers
 --------------------
@@ -106,7 +106,7 @@ To encrypt data in this client, a ``MasterKeyProvider`` object must contain at l
 
 ``MasterKeyProvider`` objects can also contain other ``MasterKeyProvider`` objects.
 
-NOTE: Master key providers are deprecated
+NOTE: Master key providers are legacy components
 and have been superseded by keyrings
 provided by the `AWS Cryptographic Material Providers Library (MPL)`_.
 Please install this library and migrate master key providers to keyring interfaces.
@@ -116,7 +116,7 @@ Master Keys
 Master keys generate, encrypt, and decrypt data keys.
 An example of a master key is an `AWS KMS key`_.
 
-NOTE: Master keys are deprecated
+NOTE: Master keys are legacy constructs
 and have been superseded by keyrings
 provided by the `AWS Cryptographic Material Providers Library (MPL)`_.
 Please install this library and migrate master key providers to keyring interfaces.

src/aws_encryption_sdk/key_providers/base.py

@@ -32,15 +32,13 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-@deprecated("Use keyrings from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class MasterKeyProviderConfig(object):
     """Provides a common ancestor for MasterKeyProvider configuration objects
     and a stand-in point if common params are needed later.
     """
 
 
-@deprecated("Use keyrings from the aws-cryptographic-material-providers library.")
 @six.add_metaclass(abc.ABCMeta)
 class MasterKeyProvider(object):
     """Parent interface for Master Key Provider classes.
@@ -327,7 +325,6 @@ def decrypt_data_key_from_list(self, encrypted_data_keys, algorithm, encryption_
         return data_key
 
 
-@deprecated("Use keyrings from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class MasterKeyConfig(object):
     """Configuration object for MasterKey objects.
@@ -345,7 +342,6 @@ def __attrs_post_init__(self):
             raise TypeError('Instances of MasterKeyConfig must have a "provider_id" attribute defined.')
 
 
-@deprecated("Use keyrings from the aws-cryptographic-material-providers library.")
 @six.add_metaclass(abc.ABCMeta)
 class MasterKey(MasterKeyProvider):
     """Parent interface for Master Key classes.

src/aws_encryption_sdk/key_providers/kms.py

@@ -129,7 +129,6 @@ def _check_mrk_arns_equal(key1, key2):
     )
 
 
-@deprecated("Use DiscoveryFilter from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class DiscoveryFilter(object):
     """DiscoveryFilter to control accounts and partitions that can be used by a KMS Master Key Provider.
@@ -144,7 +143,6 @@ class DiscoveryFilter(object):
     partition = attr.ib(default=None, hash=True, validator=attr.validators.optional(attr.validators.instance_of(str)))
 
 
-@deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class KMSMasterKeyConfig(MasterKeyConfig):
     """Configuration object for KMSMasterKey objects.
@@ -173,7 +171,6 @@ def client_default(self):
         return boto3.session.Session(**kwargs).client("kms", config=botocore_config)
 
 
-@deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
 class KMSMasterKey(MasterKey):
     """Master Key class for KMS CMKs.
 
@@ -386,7 +383,6 @@ def _validate_allowed_to_decrypt(self, edk_key_id):
             )
 
 
-@deprecated("Use KMS MRK keyrings from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class MRKAwareKMSMasterKeyConfig(MasterKeyConfig):
     """Configuration object for MRKAwareKMSMasterKey objects. Mostly the same as KMSMasterKey, except the
@@ -410,7 +406,6 @@ class MRKAwareKMSMasterKeyConfig(MasterKeyConfig):
     )
 
 
-@deprecated("Use KMS MRK keyrings from the aws-cryptographic-material-providers library.")
 class MRKAwareKMSMasterKey(KMSMasterKey):
     """Master Key class for KMS MRKAware CMKs. The logic for this class is almost entirely the same as a normal
     KMSMasterKey ("single-region key"). The primary difference is that this class is more flexible in what ciphertexts
@@ -520,7 +515,6 @@ def owns_data_key(self, data_key):
         return False
 
 
-@deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class KMSMasterKeyProviderConfig(MasterKeyProviderConfig):
     """Configuration object for KMSMasterKeyProvider objects.
@@ -557,7 +551,6 @@ class KMSMasterKeyProviderConfig(MasterKeyProviderConfig):
     )
 
 
-@deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
 @six.add_metaclass(abc.ABCMeta)
 class BaseKMSMasterKeyProvider(MasterKeyProvider):
     """Master Key Provider for KMS.
@@ -747,7 +740,6 @@ def _new_master_key_impl(self, key_id):
         )
 
 
-@deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
 class StrictAwsKmsMasterKeyProvider(BaseKMSMasterKeyProvider):
     """Strict Master Key Provider for KMS. It is configured with an explicit list of AWS KMS master keys that
     should be used for encryption and decryption. On encryption, the plaintext will be encrypted with all configured
@@ -814,7 +806,6 @@ def validate_config(self):
             )
 
 
-@deprecated("Use KMS MRK keyrings from the aws-cryptographic-material-providers library.")
 class MRKAwareStrictAwsKmsMasterKeyProvider(StrictAwsKmsMasterKeyProvider):
     """A Strict Master Key Provider for KMS that has smarts for handling Multi-Region keys.
 
@@ -884,7 +875,6 @@ def validate_unique_mrks(self):
             )
 
 
-@deprecated("Use KMS discovery keyrings from the aws-cryptographic-material-providers library.")
 class DiscoveryAwsKmsMasterKeyProvider(BaseKMSMasterKeyProvider):
     """Discovery Master Key Provider for KMS. This can only be used for decryption. It is configured with an optional
      Discovery Filter containing AWS account ids and partitions that should be trusted for decryption. If a ciphertext
@@ -940,7 +930,6 @@ def validate_config(self):
             )
 
 
-@deprecated("Use KMS MRK keyrings from the aws-cryptographic-material-providers library.")
 class MRKAwareDiscoveryAwsKmsMasterKeyProvider(DiscoveryAwsKmsMasterKeyProvider):
     """Discovery Master Key Provider for KMS that has smarts for handling Multi-Region keys
 

src/aws_encryption_sdk/key_providers/raw.py

@@ -29,7 +29,6 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-@deprecated("Use raw keyrings from the aws-cryptographic-material-providers library.")
 @attr.s(hash=True)
 class RawMasterKeyConfig(MasterKeyConfig):
     """Configuration object for RawMasterKey objects.
@@ -48,7 +47,6 @@ class RawMasterKeyConfig(MasterKeyConfig):
     wrapping_key = attr.ib(hash=True, validator=attr.validators.instance_of(WrappingKey))
 
 
-@deprecated("Use raw keyrings from the aws-cryptographic-material-providers library.")
 class RawMasterKey(MasterKey):
     """Raw Master Key.
 
@@ -191,7 +189,6 @@ def _decrypt_data_key(self, encrypted_data_key, algorithm, encryption_context):
         )
 
 
-@deprecated("Use raw keyrings from the aws-cryptographic-material-providers library.")
 @six.add_metaclass(abc.ABCMeta)
 class RawMasterKeyProvider(MasterKeyProvider):
     """Raw Master Key Provider.

src/aws_encryption_sdk/materials_managers/base.py

@@ -19,7 +19,6 @@
 
 
 @six.add_metaclass(abc.ABCMeta)
-@deprecated("Use CMMs from the aws-cryptographic-material-providers library.")
 class CryptoMaterialsManager(object):
     """Parent interface for crypto material manager classes.
 

src/aws_encryption_sdk/materials_managers/caching.py

@@ -36,7 +36,6 @@
 
 
 @attr.s(hash=False)
-@deprecated("Use the hierarchical keyring from the aws-cryptographic-material-providers library.")
 class CachingCryptoMaterialsManager(CryptoMaterialsManager):
     """Crypto material manager which caches results from an underlying material manager.
 

src/aws_encryption_sdk/materials_managers/default.py

@@ -32,7 +32,6 @@
 
 
 @attr.s(hash=False)
-@deprecated("Use CMMs from the aws-cryptographic-material-providers library.")
 class DefaultCryptoMaterialsManager(CryptoMaterialsManager):
     """Default crypto material manager.