Skip to content

Commit 66a5525

Browse files
committed
Made all suggested changes
1 parent dc0b508 commit 66a5525

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

src/aws_encryption_sdk/keyring/multi_keyring.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __attrs_post_init__(self):
4949
raise TypeError("At least one of generator or children must be provided")
5050

5151
_generator = (self.generator,) if self.generator is not None else ()
52-
self._decryption_keyrings = itertools.chain(_generator, self.children)
52+
self._decryption_keyrings = list(itertools.chain(_generator, self.children))
5353

5454
def on_encrypt(self, encryption_materials):
5555
# type: (EncryptionMaterials) -> EncryptionMaterials

test/unit/test_keyring_multi.py

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,30 +97,26 @@ def test_parent():
9797

9898
def test_keyring_with_generator_but_no_children():
9999
generator_keyring = RawAESKeyring(
100-
key_namespace=_PROVIDER_ID,
101-
key_name=_KEY_ID,
102-
wrapping_key=_WRAPPING_KEY_AES,
103-
wrapping_algorithm=WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING,
104-
)
105-
test_multi_keyring = MultiKeyring(
106-
generator=generator_keyring
100+
key_namespace=_PROVIDER_ID,
101+
key_name=_KEY_ID,
102+
wrapping_key=_WRAPPING_KEY_AES,
103+
wrapping_algorithm=WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING,
107104
)
105+
test_multi_keyring = MultiKeyring(generator=generator_keyring)
108106
assert test_multi_keyring.generator is generator_keyring
109107
assert not test_multi_keyring.children
110108

111109

112110
def test_keyring_with_children_but_no_generator():
113111
children_keyring = [
114-
RawAESKeyring(
115-
key_namespace=_PROVIDER_ID,
116-
key_name=_KEY_ID,
117-
wrapping_key=_WRAPPING_KEY_AES,
118-
wrapping_algorithm=WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING,
119-
)
120-
]
121-
test_multi_keyring = MultiKeyring(
122-
children=children_keyring
123-
)
112+
RawAESKeyring(
113+
key_namespace=_PROVIDER_ID,
114+
key_name=_KEY_ID,
115+
wrapping_key=_WRAPPING_KEY_AES,
116+
wrapping_algorithm=WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING,
117+
)
118+
]
119+
test_multi_keyring = MultiKeyring(children=children_keyring)
124120
assert test_multi_keyring.children is children_keyring
125121
assert test_multi_keyring.generator is None
126122

@@ -151,7 +147,7 @@ def test_decryption_keyrings():
151147
assert test_multi_keyring.generator in test_multi_keyring._decryption_keyrings
152148
for child_keyring in test_multi_keyring.children:
153149
assert child_keyring in test_multi_keyring._decryption_keyrings
154-
# assert len(list(test_multi_keyring._decryption_keyrings)) == len(test_multi_keyring.children) + 1
150+
assert len(test_multi_keyring._decryption_keyrings) == len(test_multi_keyring.children) + 1
155151

156152

157153
def test_on_encrypt_with_no_generator_no_data_encryption_key():

0 commit comments

Comments
 (0)