TrueCloudLab/s3-tests
7
0
Fork 1
mirror of https://github.com/ceph/s3-tests.git synced 2025-05-14 11:11:20 +00:00
Code Issues 2 Projects Releases Packages Wiki Activity

sse-kms test keys parametrization

Browse source 
Signed-off-by: Andrea Baglioni <andrea.baglioni@workday.com>
This commit is contained in:
Andrea Baglioni 2019-09-23 21:02:23 +01:00
parent 4f9710a23b
commit b051efdada
2 changed files with 121 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

12
s3tests_boto3/functional/__init__.py
View file

@ -176,8 +176,11 @@ def setup():
try:
config.main_kms_keyid = cfg.get('s3 main',"kms_keyid")
except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
config.main_kms_keyid = None
pass
config.main_kms_keyid = 'testkey-1'
try:
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")
@ -303,7 +306,7 @@ def get_new_bucket_resource(name=None):
Always recreates a bucket from scratch. This is useful to also
reset ACLs and such.
"""
s3 = boto3.resource('s3',
s3 = boto3.resource('s3',
aws_access_key_id=config.main_access_key,
aws_secret_access_key=config.main_secret_key,
endpoint_url=config.default_endpoint,
@ -363,6 +366,9 @@ 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