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 plugin - allow s3 bucket to use it's own region setting #603

Closed
wants to merge 4 commits into from
Closed

ssm connection plugin - allow s3 bucket to use it's own region setting #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0aa933b
allow s3 bucket to use it's own region setting
Jun 16, 2021
5a2ad36
change or conditional
Jun 28, 2021
b7cc84b
add changelog and fix logic
Jun 29, 2021
663567d
update how regions are determined
Jun 29, 2021
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
6 changes: 6 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ community.aws Release Notes

.. contents:: Topics

v2.0.0
Copy link
Member

Choose a reason for hiding this comment

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

I think the CHANGELOG.rst is somewhat autogenerated. You need to revert this and add a changelogs/fragments file

======

Minor Changes
-------------
- aws_ssm connection plugin - added support for an independent bucket region (https://github.com/ansible-collections/community.aws/pull/603).

v1.5.0
======
Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace: community
name: aws
version: 1.5.0
version: 2.0.0
readme: README.md
authors:
- Ansible (https://github.com/ansible)
Expand Down
12 changes: 11 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 @@ -48,6 +48,11 @@
description: The name of the S3 bucket used for file transfers.
vars:
- name: ansible_aws_ssm_bucket_name
bucket_region:
description: The region of the S3 bucket used for file transfers.
vars:
- name: ansible_aws_ssm_bucket_region
version_added: 2.0.0
plugin:
description: This defines the location of the session-manager-plugin binary.
vars:
Expand Down Expand Up @@ -508,7 +513,12 @@ def _flush_stderr(self, subprocess):

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

client = self._get_boto_client('s3', region_name=region_name, profile_name=profile_name)
return client.generate_presigned_url(client_method, Params={'Bucket': bucket_name, 'Key': out_path}, ExpiresIn=3600, HttpMethod=http_method)

Expand Down