8000 TRCS-903: Pass CreateBucketConfiguration for regional endpoints by khasanovbi · Pull Request #11 · rabataio/s3-ceph-tests · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

TRCS-903: Pass CreateBucketConfiguration for regional endpoints #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 18, 2025
Merged

TRCS-903: Pass CreateBucketConfiguration for regional endpoints #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b909aca
TRCS-903: Pass region to regional endpoints
khasanovbi May 17, 2025
608b679
Pass CreateBucketConfiguration for non default regions
khasanovbi May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ config.yaml
build
.tox
.env
aws.s3tests.conf
rcs.s3tests.conf
*.s3tests.conf
selection.txt
2 changes: 1 addition & 1 deletion s3tests/functional/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ def get_new_bucket(target=None, name=None, headers=None):
'bucket_name': name,
'headers': headers,
}
if target.conf.api_name != DEFAULT_REGION:
if target.conf.api_name not in ('', DEFAULT_REGION):
params['location'] = target.conf.api_name

bucket = connection.create_bucket(**params)
Expand Down
9 changes: 8 additions & 1 deletion s3tests_boto3/functional/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ def choose_bucket_prefix(template, max_len=30):
),
)

def create_bucket(client, **params):
if 'CreateBucketConfiguration' not in params and client.meta.region_name not in ('', DEFAULT_REGION):
params['CreateBucketConfiguration'] = {'LocationConstraint': client.meta.region_name}

return client.create_bucket(**params)

def get_buckets_list(client=None, prefix=None):
if client == None:
client = get_client()
Expand Down Expand Up @@ -390,6 +396,7 @@ def get_client(client_config=None):
aws_access_key_id=config.main_access_key,
aws_secret_access_key=config.main_secret_key,
endpoint_url=config.default_endpoint,
region_name=config.main_api_name,
use_ssl=config.default_is_secure,
verify=config.default_ssl_verify,
config=client_config)
Expand Down Expand Up @@ -580,7 +587,7 @@ def get_new_bucket(client=None, name=None):
if name is None:
name = get_new_bucket_name()

client.create_bucket(Bucket=name)
create_bucket(client, Bucket=name)
return name

def get_parameter_name():
Expand Down
15 changes: 8 additions & 7 deletions s3tests_boto3/functional/test_headers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from . import (
configfile,
create_bucket,
setup_teardown,
get_client,
get_v2_client,
Expand Down Expand Up @@ -105,7 +106,7 @@ def _add_header_create_bucket(headers, client=None):
# pass in custom headers before PutObject call
add_headers = (lambda **kwargs: kwargs['params']['headers'].update(headers))
client.meta.events.register('before-call.s3.CreateBucket', add_headers)
client.create_bucket(Bucket=bucket_name)
create_bucket(client, Bucket=bucket_name)

return bucket_name

Expand All @@ -120,7 +121,7 @@ def _add_header_create_bad_bucket(headers=None, client=None):
add_headers = (lambda **kwargs: kwargs['request'].headers.update(headers))
client.meta.events.register('before-send.s3.CreateBucket', add_headers)

e = assert_raises(ClientError, client.create_bucket, Bucket=bucket_name)
e = assert_raises(ClientError, create_bucket, client, Bucket=bucket_name)

return e

Expand All @@ -138,7 +139,7 @@ def remove_header(**kwargs):
del kwargs['request'].headers[remove]

client.meta.events.register('before-send.s3.CreateBucket', remove_header)
client.create_bucket(Bucket=bucket_name)
create_bucket(client, Bucket=bucket_name)

return bucket_name

Expand All @@ -155,7 +156,7 @@ def remove_header(**kwargs):
del kwargs['request'].headers[remove]

client.meta.events.register('before-send.s3.CreateBucket', remove_header)
e = assert_raises(ClientError, client.create_bucket, Bucket=bucket_name)
e = assert_raises(ClientError, create_bucket, client, Bucket=bucket_name)

return e

Expand Down Expand Up @@ -329,7 +330,7 @@ def _setup_bucket_acl():
client = get_client()

try:
client.create_bucket(Bucket=bucket_name, ObjectOwnership='BucketOwnerPreferred')
create_bucket(client, Bucket=bucket_name, ObjectOwnership='BucketOwnerPreferred')
client.put_public_access_block(
Bucket=bucket_name,
PublicAccessBlockConfiguration={
Expand All @@ -341,7 +342,7 @@ def _setup_bucket_acl():
)
except:
# NOTE: Skip error until we don't implement PutPublicAccessBlock API.
client.create_bucket(Bucket=bucket_name)
create_bucket(client, Bucket=bucket_name)

return bucket_name

Expand Down Expand Up @@ -383,7 +384,7 @@ def test_bucket_create_bad_expect_mismatch():
headers = {'Expect': 200}
add_headers = (lambda **kwargs: kwargs['params']['headers'].update(headers))
client.meta.events.register('before-call.s3.CreateBucket', add_headers)
client.create_bucket(Bucket=bucket_name)
create_bucket(client, Bucket=bucket_name)

@pytest.mark.auth_common
def test_bucket_create_bad_expect_empty():
Expand Down
9 changes: 5 additions & 4 deletions s3tests_boto3/functional/test_iam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from s3tests_boto3.functional.test_s3 import _multipart_upload
from . import (
configfile,
create_bucket,
setup_teardown,
get_alt_client,
get_iam_client,
Expand Down Expand Up @@ -2145,7 +2146,7 @@ def test_same_account_role_policy_allow(iam_root, iam_alt_root):
key = iam_alt_root.create_access_key(UserName=user_name)['AccessKey']

s3_main = get_iam_root_client(service_name='s3')
s3_main.create_bucket(Bucket=bucket_name)
create_bucket(s3_main, Bucket=bucket_name)

trust_policy = json.dumps({
'Version': '2012-10-17',
Expand Down Expand Up @@ -2210,7 +2211,7 @@ def test_cross_account_role_policy_allow(iam_root, iam_alt_root):
key = iam_alt_root.create_access_key(UserName=user_name)['AccessKey']

s3_alt = get_iam_alt_root_client(service_name='s3')
s3_alt.create_bucket(Bucket=bucket_name)
create_bucket(s3_alt, Bucket=bucket_name)

trust_policy = json.dumps({
'Version': '2012-10-17',
Expand Down Expand Up @@ -2318,7 +2319,7 @@ def test_account_role_policy_allow_create_bucket(iam_root, iam_alt_root):
aws_session_token = creds['SessionToken'])

# expect AccessDenied because no identity policy allows s3 actions
e = assert_raises(ClientError, s3.create_bucket, Bucket=bucket_name, ObjectOwnership='ObjectWriter', ACL='private')
e = assert_raises(ClientError, create_bucket, s3, Bucket=bucket_name, ObjectOwnership='ObjectWriter', ACL='private')
status, error_code = _get_status_and_error_code(e.response)
assert status == 403
assert error_code == 'AccessDenied'
Expand All @@ -2336,7 +2337,7 @@ def test_account_role_policy_allow_create_bucket(iam_root, iam_alt_root):

# the policy may take a bit to start working. retry until it returns
# something other than AccessDenied
retry_on('AccessDenied', 10, s3.create_bucket, Bucket=bucket_name, ObjectOwnership='ObjectWriter', ACL='private')
retry_on('AccessDenied', 10, create_bucket, s3, Bucket=bucket_name, ObjectOwnership='ObjectWriter', ACL='private')

# verify that the bucket is owned by the role's account
s3_main = get_iam_root_client(service_name='s3')
Expand Down
Loading
0