ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-03 15:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[aws] Remove walrus conditional in aws_s3 module when using custom s3_url (#36832)

Browse source 
fix aws_s3 module to use custum s3_url.
This commit is contained in:
Christian Groschupp 2018-06-07 21:07:52 +02:00 • committed by Ryan Brown
parent d2a1b75913
commit e59742eccd
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/aws_s3_fix_custom_endpoints.yaml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- allow custom endpoints to be used in the aws_s3 module (https://github.com/ansible/ansible/pull/36832)

14
lib/ansible/modules/cloud/amazon/aws_s3.py
View file

@ -625,17 +625,6 @@ def is_fakes3(s3_url):
return False return False
def is_walrus(s3_url):
""" Return True if it's Walrus endpoint, not S3
We assume anything other than *.amazonaws.com is Walrus"""
if s3_url is not None:
o = urlparse(s3_url)
return not o.netloc.endswith('amazonaws.com')
else:
return False
def get_s3_connection(module, aws_connect_kwargs, location, rgw, s3_url, sig_4=False): def get_s3_connection(module, aws_connect_kwargs, location, rgw, s3_url, sig_4=False):
if s3_url and rgw: # TODO - test this if s3_url and rgw: # TODO - test this
rgw = urlparse(s3_url) rgw = urlparse(s3_url)
@ -654,9 +643,6 @@ def get_s3_connection(module, aws_connect_kwargs, location, rgw, s3_url, sig_4=F
params = dict(module=module, conn_type='client', resource='s3', region=location, params = dict(module=module, conn_type='client', resource='s3', region=location,
endpoint="%s://%s:%s" % (protocol, fakes3.hostname, to_text(port)), endpoint="%s://%s:%s" % (protocol, fakes3.hostname, to_text(port)),
use_ssl=fakes3.scheme == 'fakes3s', **aws_connect_kwargs) use_ssl=fakes3.scheme == 'fakes3s', **aws_connect_kwargs)
elif is_walrus(s3_url):
walrus = urlparse(s3_url).hostname
params = dict(module=module, conn_type='client', resource='s3', region=location, endpoint=walrus, **aws_connect_kwargs)
else: else:
params = dict(module=module, conn_type='client', resource='s3', region=location, endpoint=s3_url, **aws_connect_kwargs) params = dict(module=module, conn_type='client', resource='s3', region=location, endpoint=s3_url, **aws_connect_kwargs)
if module.params['mode'] == 'put' and module.params['encryption_mode'] == 'aws:kms': if module.params['mode'] == 'put' and module.params['encryption_mode'] == 'aws:kms':