Skip to content

Commit

Permalink
Use HeadBucket instead of GetBucketLocation (ansible-collections#1979)
Browse files Browse the repository at this point in the history
  • Loading branch information
raulpedroche authored and markuman committed Jun 7, 2024
1 parent d0bcaf0 commit 4defdfe
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions plugins/connection/aws_ssm.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,13 +427,12 @@ def _get_bucket_endpoint(self):
)
# Fetch the location of the bucket so we can open a client against the 'right' endpoint
# This /should/ always work
bucket_location = tmp_s3_client.get_bucket_location(
head_bucket = tmp_s3_client.head_bucket(
Bucket=(self.get_option("bucket_name")),
)
if bucket_location["LocationConstraint"]:
bucket_region = bucket_location["LocationConstraint"]
else:
bucket_region = "us-east-1"
bucket_region = head_bucket.get("ResponseMetadata", {}).get("HTTPHeaders", {}).get("x-amz-bucket-region", None)
if bucket_region is None:
bucket_region = "us-east-1"

if self.get_option("bucket_endpoint_url"):
return self.get_option("bucket_endpoint_url"), bucket_region
Expand Down

0 comments on commit 4defdfe

Please sign in to comment.