Skip to content
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

[s3] Allow S3-compatible endpoints, expose more options #2759

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[s3] Allow S3-compatible endpoints, expose more options #2759

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
60 changes: 57 additions & 3 deletions connectors/sources/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,20 @@ def __init__(self, configuration):
read_timeout=self.configuration["read_timeout"],
connect_timeout=self.configuration["connect_timeout"],
retries={"max_attempts": self.configuration["max_attempts"]},
s3={
"addressing_style": self.configuration["s3_addressing_style"],
},
use_fips_endpoint=self.configuration["aws_use_fips_endpoint"],
use_dualstack_endpoint=self.configuration["aws_use_dualstack_endpoint"],
)

if self.configuration["s3_endpoint_url"]:
self.s3_endpoint_url = self.configuration["s3_endpoint_url"]
elif AWS_ENDPOINT is not None:
self.s3_endpoint_url = AWS_ENDPOINT
else:
self.s3_endpoint_url = None

self.clients = {}
self.client_context = []

Expand All @@ -64,8 +77,8 @@ async def client(self, region=None):
if region_name in self.clients:
return self.clients[region_name]

if AWS_ENDPOINT is not None:
self._logger.debug(f"Creating a session against {AWS_ENDPOINT}")
if self.s3_endpoint_url is not None:
self._logger.debug(f"Creating a session against {self.s3_endpoint_url}")

# AsyncExitStack, supports asynchronous context managers, used to create client using enter_async_context and
# these context manager will be stored in client_context list also client will be stored in clients dict with their region
Expand All @@ -74,7 +87,7 @@ async def client(self, region=None):
self.session.client(
service_name="s3",
config=self.config,
endpoint_url=AWS_ENDPOINT,
endpoint_url=self.s3_endpoint_url,
region_name=region,
)
)
Expand Down Expand Up @@ -362,6 +375,47 @@ def get_default_configuration(cls):
"sensitive": True,
"type": "str",
},
"s3_addressing_style": {
"default_value": "auto",
"display": "dropdown",
"label": "S3 Bucket Addressing Style",
"options": [
{"label": "Auto", "value": "auto"},
{"label": "Virtual", "value": "virtual"},
{"label": "Path", "value": "path"},
],
"order": 4,
"type": "str",
"value": "auto",
"tooltip": 'AWS users are recommended to use "Auto", S3-compatible users should refer to their provider.',
"ui_restrictions": ["advanced"],
},
"s3_endpoint_url": {
"label": "S3 Endpoint URL",
"order": 5,
"required": False,
"type": "str",
"tooltip": "AWS users are recommended to keep this blank, S3-compatible users should enter a complete URL from their provider.",
"ui_restrictions": ["advanced"],
},
"aws_use_fips_endpoint": {
"display": "toggle",
"label": "Use FIPS 140-3 Endpoints",
"order": 6,
"tooltip": "Not available in all regions.",
"type": "bool",
"ui_restrictions": ["advanced"],
"value": False,
},
"aws_use_dualstack_endpoint": {
"display": "toggle",
"label": "Use Dualstack Endpoints",
"order": 7,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you go through the order values for the configurations after this and update them?

"tooltip": "By default, only IPv4 is used. Enable to use dual IPv4/IPv6 endpoints.",
"type": "bool",
"ui_restrictions": ["advanced"],
"value": False,
},
"read_timeout": {
"default_value": DEFAULT_READ_TIMEOUT,
"display": "numeric",
Expand Down
Loading