diff --git a/s3tests.conf.SAMPLE b/s3tests.conf.SAMPLE index 9593fc1..60e9928 100644 --- a/s3tests.conf.SAMPLE +++ b/s3tests.conf.SAMPLE @@ -19,6 +19,14 @@ ssl_verify = False ## the prefix to 30 characters long, and avoid collisions bucket prefix = yournamehere-{random}- +# all the iam account resources (users, roles, etc) created +# will start with this name prefix +iam name prefix = s3-tests- + +# all the iam account resources (users, roles, etc) created +# will start with this path prefix +iam path prefix = /s3-tests/ + [s3 main] # main display_name set in vstart.sh display_name = M. Tester diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py index 0636932..d45e626 100644 --- a/s3tests_boto3/functional/__init__.py +++ b/s3tests_boto3/functional/__init__.py @@ -261,11 +261,12 @@ def configure(): config.tenant_email = cfg.get('s3 tenant',"email") # vars from the fixtures section - try: - template = cfg.get('fixtures', "bucket prefix") - except (configparser.NoOptionError): - template = 'test-{random}-' + template = cfg.get('fixtures', "bucket prefix", fallback='test-{random}-') prefix = choose_bucket_prefix(template=template) + template = cfg.get('fixtures', "iam name prefix", fallback="s3-tests-") + config.iam_name_prefix = choose_bucket_prefix(template=template) + template = cfg.get('fixtures', "iam path prefix", fallback="/s3-tests/") + config.iam_path_prefix = choose_bucket_prefix(template=template) if cfg.has_section("s3 cloud"): get_cloud_config(cfg) @@ -700,6 +701,15 @@ def get_token(): def get_realm_name(): return config.webidentity_realm +def get_iam_name_prefix(): + return config.iam_name_prefix + +def make_iam_name(name): + return config.iam_name_prefix + name + +def get_iam_path_prefix(): + return config.iam_path_prefix + def get_iam_access_key(): return config.iam_access_key