Check AWS region and credentials are provided.

reviewable/pr18780/r1
Alan Loi 10 years ago
parent 9e8802cacd
commit c7f0fafe62

@ -119,7 +119,7 @@ try:
from boto.dynamodb2.table import Table from boto.dynamodb2.table import Table
from boto.dynamodb2.fields import HashKey, RangeKey from boto.dynamodb2.fields import HashKey, RangeKey
from boto.dynamodb2.types import STRING, NUMBER, BINARY from boto.dynamodb2.types import STRING, NUMBER, BINARY
from boto.exception import BotoServerError, JSONResponseError from boto.exception import BotoServerError, NoAuthHandlerFound, JSONResponseError
HAS_BOTO = True HAS_BOTO = True
except ImportError: except ImportError:
@ -261,8 +261,15 @@ def main():
module.fail_json(msg='boto required for this module') module.fail_json(msg='boto required for this module')
region, ec2_url, aws_connect_params = get_aws_connection_info(module) region, ec2_url, aws_connect_params = get_aws_connection_info(module)
if not region:
module.fail_json(msg='region must be specified')
try:
connection = connect_to_aws(boto.dynamodb2, region, **aws_connect_params) connection = connect_to_aws(boto.dynamodb2, region, **aws_connect_params)
except (NoAuthHandlerFound, StandardError), e:
module.fail_json(msg=str(e))
state = module.params.get('state') state = module.params.get('state')
if state == 'present': if state == 'present':
create_or_update_dynamo_table(connection, module) create_or_update_dynamo_table(connection, module)
@ -274,4 +281,5 @@ def main():
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import * from ansible.module_utils.ec2 import *
main() if __name__ == '__main__':
main()

Loading…
Cancel
Save