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

ssm connection: pull bucket region info rather than taking from region var #1176

Merged
merged 9 commits into from
Jun 30, 2022
Merged

ssm connection: pull bucket region info rather than taking from region var #1176

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a16ea0
ssm connection: pull bucket region info rather than taking from regio…
JLukeBlakey May 30, 2022
5f30492
add changelog fragment
JLukeBlakey May 30, 2022
3e0470f
fix whitespace syntax
JLukeBlakey May 30, 2022
e4cea21
fix yaml indentation
JLukeBlakey May 30, 2022
47a80b5
rename file
JLukeBlakey May 30, 2022
2d8c4e7
fix yaml syntax
JLukeBlakey May 30, 2022
f1f6d27
reduce get bucket location code
JLukeBlakey Jun 20, 2022
3c31768
Link issue in changelog
tremble Jun 30, 2022
d1ad8b6
bugfix not minor_change
tremble Jun 30, 2022
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 changelogs/fragments/1176-ssm-connection-plugin-region-fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- aws_ssm - pull s3 bucket region for session generated for file transfer during playbooks
8 changes: 7 additions & 1 deletion plugins/connection/aws_ssm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,13 @@ def _flush_stderr(self, subprocess):

def _get_url(self, client_method, bucket_name, out_path, http_method, profile_name, extra_args=None):
''' Generate URL for get_object / put_object '''
region_name = self.get_option('region') or 'us-east-1'

client_s3 = boto3.client('s3')
bucket_location = client_s3.get_bucket_location(
Bucket=(self.get_option('bucket_name')),
)
region_name = bucket_location['LocationConstraint']

client = self._get_boto_client('s3', region_name=region_name, profile_name=profile_name)
params = {'Bucket': bucket_name, 'Key': out_path}
if extra_args is not None:
Expand Down