s/KeyRing/Keyring/g

Author: mattsb42-aws

src/aws_encryption_sdk/identifiers.py

@@ -330,7 +330,7 @@ class ContentAADString(Enum):
     NON_FRAMED_STRING_ID = b"AWSKMSEncryptionClient Single Block"
 
 
-class KeyRingTraceFlag(Enum):
+class KeyringTraceFlag(Enum):
     """KeyRing Trace actions."""
 
     WRAPPING_KEY_GENERATED_DATA_KEY = 1

src/aws_encryption_sdk/materials_managers/__init__.py

@@ -18,9 +18,9 @@
 import six
 from attr.validators import deep_iterable, deep_mapping, instance_of, optional
 
-from ..identifiers import Algorithm, KeyRingTraceFlag
+from ..identifiers import Algorithm, KeyringTraceFlag
 from ..internal.utils.streams import ROStream
-from ..structures import DataKey, EncryptedDataKey, KeyRingTrace
+from ..structures import DataKey, EncryptedDataKey, KeyringTrace
 
 
 @attr.s(hash=False)
@@ -64,7 +64,7 @@ class CryptographicMaterials(object):
     :param encrypted_data_keys: List of encrypted data keys
     :type encrypted_data_keys: list of :class:`EncryptedDataKey`
     :param keyring_trace: Any KeyRing trace entries
-    :type keyring_trace: list of :class:`KeyRingTrace`
+    :type keyring_trace: list of :class:`KeyringTrace`
     """
 
     algorithm = attr.ib(validator=optional(instance_of(Algorithm)))
@@ -78,7 +78,7 @@ class CryptographicMaterials(object):
         default=attr.Factory(list), validator=optional(deep_iterable(member_validator=instance_of(EncryptedDataKey)))
     )
     keyring_trace = attr.ib(
-        default=attr.Factory(list), validator=optional(deep_iterable(member_validator=instance_of(KeyRingTrace)))
+        default=attr.Factory(list), validator=optional(deep_iterable(member_validator=instance_of(KeyringTrace)))
     )
 
 
@@ -103,7 +103,7 @@ class EncryptionMaterials(CryptographicMaterials):
     :param dict encryption_context: Encryption context tied to `encrypted_data_keys`
     :param bytes signing_key: Encoded signing key (optional)
     :param keyring_trace: Any KeyRing trace entries (optional)
-    :type keyring_trace: list of :class:`KeyRingTrace`
+    :type keyring_trace: list of :class:`KeyringTrace`
     """
 
     signing_key = attr.ib(default=None, validator=attr.validators.optional(attr.validators.instance_of(bytes)))
@@ -177,7 +177,7 @@ class DecryptionMaterials(CryptographicMaterials):
     :param dict encryption_context: Encryption context tied to `encrypted_data_keys` (optional)
     :param bytes verification_key: Raw signature verification key (optional)
     :param keyring_trace: Any KeyRing trace entries (optional)
-    :type keyring_trace: list of :class:`KeyRingTrace`
+    :type keyring_trace: list of :class:`KeyringTrace`
     """
 
     verification_key = attr.ib(default=None, validator=attr.validators.optional(attr.validators.instance_of(bytes)))

src/aws_encryption_sdk/structures.py

@@ -108,15 +108,15 @@ class EncryptedDataKey(object):
 
 
 @attr.s
-class KeyRingTrace(object):
+class KeyringTrace(object):
     """Record of all actions that a KeyRing performed with a wrapping key.
 
     :param MasterKeyInfo wrapping_key: Wrapping key used
     :param flags: Actions performed
-    :type flags: set of :class:`KeyRingTraceFlag`
+    :type flags: set of :class:`KeyringTraceFlag`
     """
 
     wrapping_key = attr.ib(validator=instance_of(MasterKeyInfo))
     flags = attr.ib(
-        validator=deep_iterable(member_validator=instance_of(aws_encryption_sdk.identifiers.KeyRingTraceFlag))
+        validator=deep_iterable(member_validator=instance_of(aws_encryption_sdk.identifiers.KeyringTraceFlag))
     )

test/unit/test_material_managers.py

@@ -15,7 +15,7 @@
 from mock import MagicMock, sentinel
 from pytest_mock import mocker  # noqa pylint: disable=unused-import
 
-from aws_encryption_sdk.identifiers import KeyRingTraceFlag
+from aws_encryption_sdk.identifiers import KeyringTraceFlag
 from aws_encryption_sdk.internal.defaults import ALGORITHM
 from aws_encryption_sdk.internal.utils.streams import ROStream
 from aws_encryption_sdk.materials_managers import (
@@ -25,7 +25,7 @@
     EncryptionMaterials,
     EncryptionMaterialsRequest,
 )
-from aws_encryption_sdk.structures import DataKey, KeyRingTrace, MasterKeyInfo
+from aws_encryption_sdk.structures import DataKey, KeyringTrace, MasterKeyInfo
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 
@@ -42,9 +42,9 @@
         data_encryption_key=_DATA_KEY,
         encrypted_data_keys=[],
         keyring_trace=[
-            KeyRingTrace(
+            KeyringTrace(
                 wrapping_key=MasterKeyInfo(provider_id="Provider", key_info=b"Info"),
-                flags={KeyRingTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY},
+                flags={KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY},
             )
         ],
     ),