cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix get_s3_connection (fixes #22317)

Browse source 
Override aws_connect_kwargs rather than prepending to them. Should fix an issue in which `calling_format` is set twice in the kwargs passed to `boto.connect_s3` or `S3Connection` if a bucket name contains a `.`
This commit is contained in:
Joshua C. Randall 2017-03-06 15:27:11 +00:00 committed by GitHub
parent aa3fbb0d54
commit 7f61b8bebd
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/cloud/amazon/s3.py
View file

@ -713,22 +713,18 @@ def main():
def get_s3_connection(aws_connect_kwargs, location, rgw, s3_url):
if s3_url and rgw:
rgw = urlparse(s3_url)
s3 = boto.connect_s3(
is_secure=rgw.scheme == 'https',
host=rgw.hostname,
port=rgw.port,
calling_format=OrdinaryCallingFormat(),
**aws_connect_kwargs
)
aws_connect_kwargs['is_secure'] = rgw.scheme == 'https'
aws_connect_kwargs['host'] = rgw.hostname
aws_connect_kwargs['port'] = rgw.port
aws_connect_kwargs['calling_format'] = OrdinaryCallingFormat()
s3 = boto.connect_s3(**aws_connect_kwargs)
elif is_fakes3(s3_url):
fakes3 = urlparse(s3_url)
s3 = S3Connection(
is_secure=fakes3.scheme == 'fakes3s',
host=fakes3.hostname,
port=fakes3.port,
calling_format=OrdinaryCallingFormat(),
**aws_connect_kwargs
)
aws_connect_kwargs['is_secure'] = fakes3.scheme == 'fakes3s'
aws_connect_kwargs['host'] = fakes3.hostname
aws_connect_kwargs['port'] = fakes3.port
aws_connect_kwargs['calling_format'] = OrdinaryCallingFormat()
s3 = S3Connection(**aws_connect_kwargs)
elif is_walrus(s3_url):
walrus = urlparse(s3_url).hostname
s3 = boto.connect_walrus(walrus, **aws_connect_kwargs)