dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

sse: add _put_bucket_encryption() helper function

Browse source 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2021-12-16 14:14:23 -05:00 committed by Ali Maredia
parent e710595552
commit 29bcd42fd1
1 changed files with 22 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
s3tests_boto3/functional/test_s3.py
View file

@ -13446,16 +13446,10 @@ def test_multipart_upload_on_a_bucket_with_policy():
response = client.complete_multipart_upload(Bucket=bucket_name, Key=key, UploadId=upload_id, MultipartUpload={'Parts': parts}) response = client.complete_multipart_upload(Bucket=bucket_name, Key=key, UploadId=upload_id, MultipartUpload={'Parts': parts})
eq(response['ResponseMetadata']['HTTPStatusCode'], 200) eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
def _put_bucket_encryption(client, bucket_name):
@attr(resource='bucket') """
@attr(method='put') enable a default encryption policy on the given bucket
@attr(operation='put bucket encryption on bucket') """
@attr(assertion='succeeds')
@attr('sse-s3')
def test_put_bucket_encryption():
bucket_name = get_new_bucket()
client = get_client()
server_side_encryption_conf = { server_side_encryption_conf = {
'Rules': [ 'Rules': [
{ {
@ -13465,11 +13459,21 @@ def test_put_bucket_encryption():
}, },
] ]
} }
response = client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf) response = client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
eq(response['ResponseMetadata']['HTTPStatusCode'], 200) eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
@attr(resource='bucket')
@attr(method='put')
@attr(operation='put bucket encryption on bucket')
@attr(assertion='succeeds')
@attr('sse-s3')
def test_put_bucket_encryption():
bucket_name = get_new_bucket()
client = get_client()
_put_bucket_encryption(client, bucket_name)
@attr(resource='bucket') @attr(resource='bucket')
@attr(method='get') @attr(method='get')
@attr(operation='get bucket encryption on bucket') @attr(operation='get bucket encryption on bucket')
@ -13487,17 +13491,7 @@ def test_get_bucket_encryption():
eq(response_code, 'ServerSideEncryptionConfigurationNotFoundError') eq(response_code, 'ServerSideEncryptionConfigurationNotFoundError')
server_side_encryption_conf = { _put_bucket_encryption(client, bucket_name)
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256'
}
},
]
}
client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
response = client.get_bucket_encryption(Bucket=bucket_name) response = client.get_bucket_encryption(Bucket=bucket_name)
eq(response['ResponseMetadata']['HTTPStatusCode'], 200) eq(response['ResponseMetadata']['HTTPStatusCode'], 200)
@ -13517,17 +13511,7 @@ def test_delete_bucket_encryption():
response = client.delete_bucket_encryption(Bucket=bucket_name) response = client.delete_bucket_encryption(Bucket=bucket_name)
eq(response['ResponseMetadata']['HTTPStatusCode'], 204) eq(response['ResponseMetadata']['HTTPStatusCode'], 204)
server_side_encryption_conf = { _put_bucket_encryption(client, bucket_name)
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256'
}
},
]
}
client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
response = client.delete_bucket_encryption(Bucket=bucket_name) response = client.delete_bucket_encryption(Bucket=bucket_name)
eq(response['ResponseMetadata']['HTTPStatusCode'], 204) eq(response['ResponseMetadata']['HTTPStatusCode'], 204)
@ -13540,18 +13524,7 @@ def _test_sse_s3_customer_write(file_size):
""" """
bucket_name = get_new_bucket() bucket_name = get_new_bucket()
client = get_client() client = get_client()
_put_bucket_encryption(client, bucket_name)
server_side_encryption_conf = {
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256'
}
},
]
}
client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
data = 'A'*file_size data = 'A'*file_size
client.put_object(Bucket=bucket_name, Key='testobj', Body=data) client.put_object(Bucket=bucket_name, Key='testobj', Body=data)
@ -13596,18 +13569,7 @@ def test_sse_s3_transfer_1mb():
def test_sse_s3_method_head(): def test_sse_s3_method_head():
bucket_name = get_new_bucket() bucket_name = get_new_bucket()
client = get_client() client = get_client()
_put_bucket_encryption(client, bucket_name)
server_side_encryption_conf = {
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256'
}
},
]
}
client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
data = 'A'*1000 data = 'A'*1000
key = 'testobj' key = 'testobj'
@ -13634,6 +13596,8 @@ def test_sse_s3_method_head():
def test_sse_s3_multipart_upload(): def test_sse_s3_multipart_upload():
bucket_name = get_new_bucket() bucket_name = get_new_bucket()
client = get_client() client = get_client()
_put_bucket_encryption(client, bucket_name)
key = "multipart_enc" key = "multipart_enc"
content_type = 'text/plain' content_type = 'text/plain'
objlen = 30 * 1024 * 1024 objlen = 30 * 1024 * 1024
@ -13642,16 +13606,6 @@ def test_sse_s3_multipart_upload():
'Content-Type': content_type 'Content-Type': content_type
} }
resend_parts = [] resend_parts = []
server_side_encryption_conf = {
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256'
}
},
]
}
client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
(upload_id, data, parts) = _multipart_upload_enc(client, bucket_name, key, objlen, (upload_id, data, parts) = _multipart_upload_enc(client, bucket_name, key, objlen,
part_size=5*1024*1024, init_headers=enc_headers, part_headers=enc_headers, metadata=metadata, resend_parts=resend_parts) part_size=5*1024*1024, init_headers=enc_headers, part_headers=enc_headers, metadata=metadata, resend_parts=resend_parts)
@ -13691,17 +13645,7 @@ def test_sse_s3_multipart_upload():
def test_sse_s3_post_object_authenticated_request(): def test_sse_s3_post_object_authenticated_request():
bucket_name = get_new_bucket() bucket_name = get_new_bucket()
client = get_client() client = get_client()
_put_bucket_encryption(client, bucket_name)
server_side_encryption_conf = {
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256'
}
},
]
}
client.put_bucket_encryption(Bucket=bucket_name, ServerSideEncryptionConfiguration=server_side_encryption_conf)
url = _get_post_url(bucket_name) url = _get_post_url(bucket_name)
utc = pytz.utc utc = pytz.utc