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

Fix aws_s3 connection exception handling (#30955)

Browse source 
`ProfileNotFound` does not have a `response` attribute, and
`NoCredentialsError` does not occur at connection creation time.
This commit is contained in:
Will Thames 2017-09-29 06:20:10 +10:00 committed by Sloane Hertel
parent 90dd698b86
commit 371c6dba8b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -609,9 +609,8 @@ def main():
aws_connect_kwargs.pop(key, None)
try:
s3 = get_s3_connection(module, aws_connect_kwargs, location, rgw, s3_url)
except (botocore.exceptions.NoCredentialsError, botocore.exceptions.ProfileNotFound) as e:
module.fail_json(msg="Can't authorize connection. Check your credentials and profile.",
exceptions=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
except botocore.exceptions.ProfileNotFound as e:
module.fail_json(msg=to_native(e))
validate = not ignore_nonexistent_bucket