Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion minio/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,8 @@ def _build_aws_url(
f"for accelerate endpoint"
)
if enforce_path_style:
netloc = netloc.replace("-accelerate", "", 1)
s3_prefix = netloc.replace("-accelerate", "", 1)
netloc = s3_prefix

if aws_info["dualstack"]:
netloc += "dualstack."
Expand Down
30 changes: 30 additions & 0 deletions tests/unit/helpers_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,36 @@ def test_aws_bucket_build(self):
)
self.assertEqual(str(url), case.result)

def test_aws_accelerate_path_style_build(self):
# Path style is forced for CreateBucket, so the accelerate endpoint
# falls back to "s3." and that form carries the region.
Case = namedtuple("Case", ["args", "result"])
cases = [
Case(
("https://s3-accelerate.amazonaws.com", None),
"https://s3.us-east-1.amazonaws.com/my-bucket",
),
Case(
("https://s3-accelerate.amazonaws.com", "ap-south-1a"),
"https://s3.ap-south-1a.amazonaws.com/my-bucket",
),
Case(
("https://s3-accelerate.dualstack.amazonaws.com", "us-west-2"),
"https://s3.dualstack.us-west-2.amazonaws.com/my-bucket",
),
]

for case in cases:
base_url = BaseURL(*case.args)
url = urlunsplit(
base_url.build(
method="PUT",
region=base_url.region or "us-east-1",
bucket_name="my-bucket",
),
)
self.assertEqual(str(url), case.result)

def test_aws_object_build(self):
Case = namedtuple("Case", ["args", "result"])
cases = [
Expand Down
Loading