Revert "Passing sse-kms keys from configuration instead of hard coding in tests"

s3tests_boto3/functional/__init__.py

@@ -169,11 +169,8 @@ def setup():
     try:
         config.main_kms_keyid = cfg.get('s3 main',"kms_keyid")
     except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-        config.main_kms_keyid = 'testkey-1'
+        config.main_kms_keyid = None
-    try:
+        pass
-        config.main_kms_keyid2 = cfg.get('s3 main',"kms_keyid2")
-    except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-        config.main_kms_keyid2 = 'testkey-2'
 
     try:
         config.main_api_name = cfg.get('s3 main',"api_name")
@@ -359,9 +356,6 @@ def get_main_api_name():
 def get_main_kms_keyid():
     return config.main_kms_keyid
 
-def get_secondary_kms_keyid():
-    return config.main_kms_keyid2
-
 def get_alt_aws_access_key():
     return config.alt_access_key
 

s3tests_boto3/functional/test_s3.py

@@ -68,7 +68,6 @@ from . import (
     get_buckets_list,
     get_objects_list,
     get_main_kms_keyid,
-    get_secondary_kms_keyid,
     nuke_prefixed_buckets,
     )
 
@@ -4396,6 +4395,7 @@ def test_bucket_acl_canned_publicreadwrite():
 
     display_name = get_main_display_name()
     user_id = get_main_user_id()
+    
     grants = response['Grants']
     check_grants(
         grants,
@@ -9765,22 +9765,52 @@ def _test_sse_kms_customer_write(file_size, key_id = 'testkey-1'):
     eq(body, data)
 
 
+@attr(resource='object')
+@attr(method='put')
+@attr(operation='Test SSE-KMS encrypted transfer 1 byte')
+@attr(assertion='success')
+@attr('encryption')
+def test_sse_kms_transfer_1b():
+    _test_sse_kms_customer_write(1)
 
 
+@attr(resource='object')
+@attr(method='put')
+@attr(operation='Test SSE-KMS encrypted transfer 1KB')
+@attr(assertion='success')
+@attr('encryption')
+def test_sse_kms_transfer_1kb():
+    _test_sse_kms_customer_write(1024)
 
 
+@attr(resource='object')
+@attr(method='put')
+@attr(operation='Test SSE-KMS encrypted transfer 1MB')
+@attr(assertion='success')
+@attr('encryption')
+def test_sse_kms_transfer_1MB():
+    _test_sse_kms_customer_write(1024*1024)
+
+
+@attr(resource='object')
+@attr(method='put')
+@attr(operation='Test SSE-KMS encrypted transfer 13 bytes')
+@attr(assertion='success')
+@attr('encryption')
+def test_sse_kms_transfer_13b():
+    _test_sse_kms_customer_write(13)
+
 @attr(resource='object')
 @attr(method='head')
 @attr(operation='Test SSE-KMS encrypted does perform head properly')
 @attr(assertion='success')
 @attr('encryption')
 def test_sse_kms_method_head():
-    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     sse_kms_client_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid
+        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-1'
     }
     data = 'A'*1000
     key = 'testobj'
@@ -9791,7 +9821,7 @@ def test_sse_kms_method_head():
 
     response = client.head_object(Bucket=bucket_name, Key=key)
     eq(response['ResponseMetadata']['HTTPHeaders']['x-amz-server-side-encryption'], 'aws:kms')
-    eq(response['ResponseMetadata']['HTTPHeaders']['x-amz-server-side-encryption-aws-kms-key-id'], kms_keyid)
+    eq(response['ResponseMetadata']['HTTPHeaders']['x-amz-server-side-encryption-aws-kms-key-id'], 'testkey-1')
 
     lf = (lambda **kwargs: kwargs['params']['headers'].update(sse_kms_client_headers))
     client.meta.events.register('before-call.s3.HeadObject', lf)
@@ -9805,12 +9835,11 @@ def test_sse_kms_method_head():
 @attr(assertion='operation success')
 @attr('encryption')
 def test_sse_kms_present():
-    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     sse_kms_client_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid
+        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-1'
     }
     data = 'A'*100
     key = 'testobj'
@@ -9870,7 +9899,6 @@ def test_sse_kms_not_declared():
 @attr(assertion='successful')
 @attr('encryption')
 def test_sse_kms_multipart_upload():
-    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     key = "multipart_enc"
@@ -9879,7 +9907,7 @@ def test_sse_kms_multipart_upload():
     metadata = {'foo': 'bar'}
     enc_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid,
+        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-2',
         'Content-Type': content_type
     }
     resend_parts = []
@@ -9920,8 +9948,6 @@ def test_sse_kms_multipart_upload():
 @attr(assertion='successful')
 @attr('encryption')
 def test_sse_kms_multipart_invalid_chunks_1():
-    kms_keyid = get_main_kms_keyid()
-    kms_keyid2 = get_secondary_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     key = "multipart_enc"
@@ -9930,12 +9956,12 @@ def test_sse_kms_multipart_invalid_chunks_1():
     metadata = {'foo': 'bar'}
     init_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid,
+        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-1',
         'Content-Type': content_type
     }
     part_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid2
+        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-2'
     }
     resend_parts = []
 
@@ -9950,7 +9976,6 @@ def test_sse_kms_multipart_invalid_chunks_1():
 @attr(assertion='successful')
 @attr('encryption')
 def test_sse_kms_multipart_invalid_chunks_2():
-    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     key = "multipart_enc"
@@ -9959,7 +9984,7 @@ def test_sse_kms_multipart_invalid_chunks_2():
     metadata = {'foo': 'bar'}
     init_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid,
+        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-1',
         'Content-Type': content_type
     }
     part_headers = {
@@ -9972,14 +9997,12 @@ def test_sse_kms_multipart_invalid_chunks_2():
             init_headers=init_headers, part_headers=part_headers, metadata=metadata, 
             resend_parts=resend_parts)
 
-
 @attr(resource='object')
 @attr(method='post')
 @attr(operation='authenticated KMS browser based upload via POST request')
 @attr(assertion='succeeds and returns written data')
 @attr('encryption')
 def test_sse_kms_post_object_authenticated_request():
-    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
 
@@ -10011,7 +10034,7 @@ def test_sse_kms_post_object_authenticated_request():
     ("acl" , "private"),("signature" , signature),("policy" , policy),\
     ("Content-Type" , "text/plain"),
     ('x-amz-server-side-encryption', 'aws:kms'), \
-    ('x-amz-server-side-encryption-aws-kms-key-id', kms_keyid), \
+    ('x-amz-server-side-encryption-aws-kms-key-id', 'testkey-1'), \
     ('file', ('bar'))])
 
     r = requests.post(url, files = payload)
@@ -10026,7 +10049,7 @@ def test_sse_kms_post_object_authenticated_request():
 @attr(operation='Test SSE-KMS encrypted transfer 1 byte')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_transfer_1b():
+def test_sse_kms_barb_transfer_1b():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest
@@ -10038,7 +10061,7 @@ def test_sse_kms_transfer_1b():
 @attr(operation='Test SSE-KMS encrypted transfer 1KB')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_transfer_1kb():
+def test_sse_kms_barb_transfer_1kb():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest
@@ -10050,7 +10073,7 @@ def test_sse_kms_transfer_1kb():
 @attr(operation='Test SSE-KMS encrypted transfer 1MB')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_transfer_1MB():
+def test_sse_kms_barb_transfer_1MB():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest
@@ -10062,7 +10085,7 @@ def test_sse_kms_transfer_1MB():
 @attr(operation='Test SSE-KMS encrypted transfer 13 bytes')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_transfer_13b():
+def test_sse_kms_barb_transfer_13b():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest