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

Jump to bottom

[ENG-5780] fixed s3 failures when setting up addon (not when browsing files) #10639

Merged
merged 1 commit into from
Jun 17, 2024
Merged

[ENG-5780] fixed s3 failures when setting up addon (not when browsing files) #10639

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
28 changes: 17 additions & 11 deletions addons/s3/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ def get_status_for_error(e: exceptions.ClientError) -> int:

def get_bucket_names(node_settings):
try:
buckets = connect_s3(node_settings=node_settings).get_all_buckets()
response = connect_s3(node_settings=node_settings).list_buckets()
except exceptions.NoCredentialsError:
raise HTTPError(http_status.HTTP_403_FORBIDDEN)
except exceptions.ClientError as e:
raise HTTPError(get_status_for_error(e))

return [bucket.name for bucket in buckets]
return [bucket['Name'] for bucket in response['Buckets']]


def validate_bucket_location(location):
Expand All @@ -63,12 +63,18 @@ def validate_bucket_name(name):


def create_bucket(node_settings, bucket_name, location=''):
return connect_s3(node_settings=node_settings).create_bucket(
Bucket=bucket_name,
CreateBucketConfiguration={
'LocationConstraint': location
}
)
client = connect_s3(node_settings=node_settings)

# default bucket location won't work with location constraint
if not location or location == 'us-east-1':
return client.create_bucket(Bucket=bucket_name)
else:
return client.create_bucket(
Bucket=bucket_name,
CreateBucketConfiguration={
'LocationConstraint': location,
}
)


def bucket_exists(access_key, secret_key, bucket_name):
Expand All @@ -82,7 +88,7 @@ def bucket_exists(access_key, secret_key, bucket_name):

try:
# Will raise an exception if bucket_name doesn't exist
connect_s3(access_key, secret_key).head_bucket(bucket_name)
connect_s3(access_key, secret_key).head_bucket(Bucket=bucket_name)
except exceptions.ClientError as e:
if get_status_for_error(e) not in (301, 302):
return False
Expand Down Expand Up @@ -112,7 +118,7 @@ class Owner:

@classmethod
def from_dict(cls, data):
return cls(data['DisplayName'], data['Id'])
return cls(data['DisplayName'], data['ID'])


def get_user_info(access_key: str, secret_key: str) -> Owner | None:
Expand All @@ -135,7 +141,7 @@ def get_bucket_location_or_error(access_key, secret_key, bucket_name):

try:
# Will raise an exception if bucket_name doesn't exist
return connect_s3(access_key, secret_key).get_bucket_location(bucket_name)['LocationConstraint']
return connect_s3(access_key, secret_key).get_bucket_location(Bucket=bucket_name)['LocationConstraint']
except exceptions.NoCredentialsError:
raise InvalidAuthError()
except exceptions.ClientError:
Expand Down
Loading