Skip to content

Rework S3 url handling for internal & external clients #13120

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Rework S3 url handling for internal & external clients #13120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9292041
Remove special S3 url handling for clients, except external clients w…
dfangl Sep 9, 2025
11ab839
Fix missing port for S3 endpoint
dfangl Sep 9, 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
12 changes: 4 additions & 8 deletions localstack-core/localstack/aws/connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import json
import logging
import re
import threading
from abc import ABC, abstractmethod
from collections.abc import Callable
Expand Down Expand Up @@ -515,9 +514,6 @@ def get_client(
config = self._config.merge(config)

endpoint_url = endpoint_url or get_service_endpoint()
if service_name == "s3" and endpoint_url:
if re.match(r"https?://localhost(:[0-9]+)?", endpoint_url):
endpoint_url = endpoint_url.replace("://localhost", f"://{get_s3_hostname()}")

return self._get_client(
service_name=service_name,
Expand Down Expand Up @@ -578,10 +574,10 @@ def get_client(
if region_name == AWS_REGION_US_EAST_1:
config = config.merge(Config(region_name=region_name))

endpoint_url = endpoint_url or get_service_endpoint()
if service_name == "s3":
if re.match(r"https?://localhost(:[0-9]+)?", endpoint_url):
endpoint_url = endpoint_url.replace("://localhost", f"://{get_s3_hostname()}")
if not endpoint_url:
endpoint_url = get_service_endpoint()
if service_name == "s3":
endpoint_url = f"{localstack_config.get_protocol()}://{get_s3_hostname()}:{localstack_config.GATEWAY_LISTEN[0].port}"

# Prevent `PartialCredentialsError` when only access key ID is provided
# The value of secret access key is insignificant and can be set to anything
Expand Down
Loading