mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-25 03:41:25 -07:00
Fix amazon extras modules to compile under python3
This commit is contained in:
parent
46a1f73778
commit
3901fe72d3
31 changed files with 192 additions and 190 deletions
|
@ -133,6 +133,8 @@ table_status:
|
|||
sample: ACTIVE
|
||||
'''
|
||||
|
||||
import traceback
|
||||
|
||||
try:
|
||||
import boto
|
||||
import boto.dynamodb2
|
||||
|
@ -152,6 +154,10 @@ try:
|
|||
except ImportError:
|
||||
HAS_BOTO = False
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.ec2 import AnsibleAWSError, connect_to_aws, ec2_argument_spec, get_aws_connection_info
|
||||
|
||||
|
||||
DYNAMO_TYPE_DEFAULT = 'STRING'
|
||||
INDEX_REQUIRED_OPTIONS = ['name', 'type', 'hash_key_name']
|
||||
INDEX_OPTIONS = INDEX_REQUIRED_OPTIONS + ['hash_key_type', 'range_key_name', 'range_key_type', 'includes', 'read_capacity', 'write_capacity']
|
||||
|
@ -244,7 +250,7 @@ def dynamo_table_exists(table):
|
|||
table.describe()
|
||||
return True
|
||||
|
||||
except JSONResponseError, e:
|
||||
except JSONResponseError as e:
|
||||
if e.message and e.message.startswith('Requested resource not found'):
|
||||
return False
|
||||
else:
|
||||
|
@ -281,7 +287,7 @@ def update_dynamo_table(table, throughput=None, check_mode=False, global_indexes
|
|||
# todo: remove try once boto has https://github.com/boto/boto/pull/3447 fixed
|
||||
try:
|
||||
global_indexes_changed = table.update_global_secondary_index(global_indexes=index_throughput_changes) or global_indexes_changed
|
||||
except ValidationException as e:
|
||||
except ValidationException:
|
||||
pass
|
||||
else:
|
||||
global_indexes_changed = True
|
||||
|
@ -398,7 +404,7 @@ def main():
|
|||
|
||||
try:
|
||||
connection = connect_to_aws(boto.dynamodb2, region, **aws_connect_params)
|
||||
except (NoAuthHandlerFound, AnsibleAWSError), e:
|
||||
except (NoAuthHandlerFound, AnsibleAWSError) as e:
|
||||
module.fail_json(msg=str(e))
|
||||
|
||||
state = module.params.get('state')
|
||||
|
@ -408,9 +414,5 @@ def main():
|
|||
delete_dynamo_table(connection, module)
|
||||
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
from ansible.module_utils.ec2 import *
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue