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

s3_sync was setting HAS_BOTO3 by the existence of botocore alone. Fixes #28023 (#28339)

Browse source 
* s3_sync was setting HAS_BOTO3 by the existence of botocore alone. Fixed to import from module_utils.ec2 to ensure boto3 + botocore are present.

Also documented module requirements.

* Remove unused import
This commit is contained in:
Sloane Hertel 2017-08-18 13:21:10 -04:00 committed by Ryan Brown
parent f8d6c71d09
commit b9762b52af
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/cloud/amazon/s3_sync.py
View file

@ -90,6 +90,10 @@ options:
required: false required: false
version_added: "2.4" version_added: "2.4"
requirements:
- boto3 >= 1.4.4
- botocore
author: tedder author: tedder
extends_documentation_fragment: extends_documentation_fragment:
- aws - aws
@ -202,16 +206,15 @@ import traceback
from dateutil import tz from dateutil import tz
# import module snippets # import module snippets
import ansible.module_utils.ec2
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ec2 import camel_dict_to_snake_dict, ec2_argument_spec from ansible.module_utils.ec2 import camel_dict_to_snake_dict, ec2_argument_spec, boto3_conn, get_aws_connection_info, HAS_BOTO3
try: try:
import botocore import botocore
HAS_BOTO3 = True
except ImportError: except ImportError:
HAS_BOTO3 = False # Handled by imported HAS_BOTO3
pass
def boto_exception(err): def boto_exception(err):
@ -488,10 +491,10 @@ def main():
result = {} result = {}
mode = module.params['mode'] mode = module.params['mode']
region, ec2_url, aws_connect_kwargs = ansible.module_utils.ec2.get_aws_connection_info(module, boto3=True) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True)
if not region: if not region:
module.fail_json(msg="Region must be specified") module.fail_json(msg="Region must be specified")
s3 = ansible.module_utils.ec2.boto3_conn(module, conn_type='client', resource='s3', region=region, endpoint=ec2_url, **aws_connect_kwargs) s3 = boto3_conn(module, conn_type='client', resource='s3', region=region, endpoint=ec2_url, **aws_connect_kwargs)
if mode == 'push': if mode == 'push':
try: try: