Skip to content

Commit c3d9f10

Browse files
authored
Allow SSEC bucket decryption in s3 integ tests v2 (#10204)
1 parent 9cc3ab6 commit c3d9f10

File tree

3 files changed

+31
-0
lines changed

3 files changed

+31
-0
lines changed

awscli/testutils.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,21 @@ def create_bucket(session, name=None, region=None):
198198
pass
199199
else:
200200
raise
201+
client.put_bucket_encryption(
202+
Bucket=bucket_name,
203+
ServerSideEncryptionConfiguration={
204+
'Rules': [
205+
{
206+
'ApplyServerSideEncryptionByDefault': {
207+
'SSEAlgorithm': 'AES256',
208+
},
209+
'BlockedEncryptionTypes': {
210+
'EncryptionType': ['NONE'],
211+
},
212+
}
213+
],
214+
},
215+
)
201216
client.delete_public_access_block(Bucket=bucket_name)
202217
return bucket_name
203218

tests/integration/botocore/test_s3.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,21 @@ def setup_module():
9191
# final call as to whether or not the bucket exists.
9292
LOG.debug("create_bucket() raised an exception: %s", e, exc_info=True)
9393
waiter.wait(Bucket=_SHARED_BUCKET)
94+
s3.put_bucket_encryption(
95+
Bucket=_SHARED_BUCKET,
96+
ServerSideEncryptionConfiguration={
97+
'Rules': [
98+
{
99+
'ApplyServerSideEncryptionByDefault': {
100+
'SSEAlgorithm': 'AES256',
101+
},
102+
'BlockedEncryptionTypes': {
103+
'EncryptionType': ['NONE'],
104+
},
105+
}
106+
],
107+
},
108+
)
94109
s3.delete_public_access_block(Bucket=_SHARED_BUCKET)
95110

96111

tests/unit/test_testutils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ def test_bucket_already_owned_by_you(self):
3333
</Error>''',
3434
),
3535
mock.Mock(status_code=200, headers={}, content=b''),
36+
mock.Mock(status_code=200, headers={}, content=b''),
3637
]
3738
self.assertEqual(create_bucket(self.session, 'bucket'), 'bucket')

0 commit comments

Comments
 (0)