fix

Author: lucasmcdonald3

src/aws_encryption_sdk/internal/deprecation.py

@@ -3,9 +3,13 @@
 
 def deprecated(reason):
     def decorator(cls):
-        @functools.wraps(cls)
-        def new_cls(*args, **kwargs):
-            warnings.warn(f"{cls.__name__} is deprecated: {reason}", category=DeprecationWarning, stacklevel=2)
-            return cls(*args, **kwargs)
-        return new_cls
+        # Define a new constructor that issues a deprecation warning
+        @functools.wraps(cls.__init__)
+        def new_init(self, *args, **kwargs):
+            warnings.warn(f"{cls.__name__} is deprecated: {reason}",
+                        category=DeprecationWarning, stacklevel=2)
+            cls.__init__(self, *args, **kwargs)
+        # Update the constructor of the class
+        cls.__init__ = new_init
+        return cls
     return decorator

src/aws_encryption_sdk/key_providers/base.py

@@ -31,17 +31,15 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-
-@attr.s(hash=True)
 @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.
     """
 
-
-@six.add_metaclass(abc.ABCMeta)
 @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.
 
@@ -326,9 +324,8 @@ def decrypt_data_key_from_list(self, encrypted_data_keys, algorithm, encryption_
             raise DecryptKeyError("Unable to decrypt any data key")
         return data_key
 
-
-@attr.s(hash=True)
 @deprecated("Use keyrings from the aws-cryptographic-material-providers library.")
+@attr.s(hash=True)
 class MasterKeyConfig(object):
     """Configuration object for MasterKey objects.
 
@@ -344,9 +341,8 @@ def __attrs_post_init__(self):
         if not hasattr(self, "provider_id"):
             raise TypeError('Instances of MasterKeyConfig must have a "provider_id" attribute defined.')
 
-
-@six.add_metaclass(abc.ABCMeta)
 @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

@@ -142,9 +142,8 @@ class DiscoveryFilter(object):
     )
     partition = attr.ib(default=None, hash=True, validator=attr.validators.optional(attr.validators.instance_of(str)))
 
-
-@attr.s(hash=True)
 @deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
+@attr.s(hash=True)
 class KMSMasterKeyConfig(MasterKeyConfig):
     """Configuration object for KMSMasterKey objects.
 
@@ -384,9 +383,8 @@ def _validate_allowed_to_decrypt(self, edk_key_id):
                 "provider's key_id={}".format(edk_key_id, self._key_id)
             )
 
-
-@attr.s(hash=True)
 @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
     client parameter is required rather than optional.
@@ -518,9 +516,8 @@ def owns_data_key(self, data_key):
             return True
         return False
 
-
-@attr.s(hash=True)
 @deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
+@attr.s(hash=True)
 class KMSMasterKeyProviderConfig(MasterKeyProviderConfig):
     """Configuration object for KMSMasterKeyProvider objects.
 
@@ -555,9 +552,8 @@ class KMSMasterKeyProviderConfig(MasterKeyProviderConfig):
         hash=True, default=None, validator=attr.validators.optional(attr.validators.instance_of(six.string_types))
     )
 
-
-@six.add_metaclass(abc.ABCMeta)
 @deprecated("Use KMS keyrings from the aws-cryptographic-material-providers library.")
+@six.add_metaclass(abc.ABCMeta)
 class BaseKMSMasterKeyProvider(MasterKeyProvider):
     """Master Key Provider for KMS.
 

src/aws_encryption_sdk/key_providers/raw.py

@@ -28,9 +28,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-
-@attr.s(hash=True)
 @deprecated("Use raw keyrings from the aws-cryptographic-material-providers library.")
+@attr.s(hash=True)
 class RawMasterKeyConfig(MasterKeyConfig):
     """Configuration object for RawMasterKey objects.
 
@@ -190,9 +189,8 @@ def _decrypt_data_key(self, encrypted_data_key, algorithm, encryption_context):
             encrypted_data_key=encrypted_data_key.encrypted_data_key,
         )
 
-
-@six.add_metaclass(abc.ABCMeta)
 @deprecated("Use raw keyrings from the aws-cryptographic-material-providers library.")
+@six.add_metaclass(abc.ABCMeta)
 class RawMasterKeyProvider(MasterKeyProvider):
     """Raw Master Key Provider.