Skip to content

Add S3 addressing style configuration support #3367

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

Open
ranjit-parva wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −0
Open

Add S3 addressing style configuration support #3367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions flytekit/configuration/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ class S3Config(object):
backoff: datetime.timedelta = datetime.timedelta(seconds=5)
access_key_id: typing.Optional[str] = None
secret_access_key: typing.Optional[str] = None
adressing_style: typing.Optional[str] = None

@classmethod
def auto(cls, config_file: typing.Union[str, ConfigFile] = None) -> S3Config:
Expand All @@ -560,6 +561,7 @@ def auto(cls, config_file: typing.Union[str, ConfigFile] = None) -> S3Config:
kwargs = set_if_exists(kwargs, "backoff", _internal.AWS.BACKOFF_SECONDS.read(config_file))
kwargs = set_if_exists(kwargs, "access_key_id", _internal.AWS.S3_ACCESS_KEY_ID.read(config_file))
kwargs = set_if_exists(kwargs, "secret_access_key", _internal.AWS.S3_SECRET_ACCESS_KEY.read(config_file))
kwargs = set_if_exists(kwargs, "adressing_style", _internal.AWS.S3_ADDRESSING_STYLE.read(config_file))
return S3Config(**kwargs)


Expand Down
4 changes: 4 additions & 0 deletions flytekit/configuration/internal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ class AWS(object):
LegacyConfigEntry(SECTION, "backoff_seconds", datetime.timedelta),
transform=lambda x: datetime.timedelta(seconds=int(x)),
)
S3_ADDRESSING_STYLE = ConfigEntry(
LegacyConfigEntry(SECTION, "addressing_style"),
YamlConfigEntry("storage.connection.addressing-style"),
)


class GCP(object):
Expand Down
3 changes: 3 additions & 0 deletions flytekit/core/data_persistence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ def s3_setup_args(s3_cfg: configuration.S3Config, anonymous: bool = False) -> Di
if s3_cfg.endpoint is not None:
kwargs["client_kwargs"] = {"endpoint_url": s3_cfg.endpoint}

if s3_cfg.adressing_style:
kwargs["config_kwargs"] = {"s3": {"addressing_style": "virtual"}}

if anonymous:
kwargs[_ANON] = True

Expand Down
Loading