internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove get_exception usage from amazon modules

Browse Source
This commit is contained in:
Toshio Kuratomi
2017-07-29 03:24:30 -07:00
parent 8de6cff2b1
commit 9a55487dff
2 changed files with 49 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/ansible/modules/cloud/amazon/sns.py
View File

@@ -129,14 +129,8 @@ EXAMPLES = """
delegate_to: localhost
"""
try:
import json
except ImportError:
import simplejson as json
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ec2 import ec2_argument_spec, connect_to_aws, get_aws_connection_info
from ansible.module_utils.pycompat24 import get_exception
import json
import traceback
try:
import boto
@@ -146,6 +140,10 @@ try:
except ImportError:
HAS_BOTO = False
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ec2 import ec2_argument_spec, connect_to_aws, get_aws_connection_info
from ansible.module_utils._text import to_native
def arn_topic_lookup(connection, short_topic):
response = connection.get_all_topics()
@@ -196,9 +194,8 @@ def main():
module.fail_json(msg="region must be specified")
try:
connection = connect_to_aws(boto.sns, region, **aws_connect_params)
except boto.exception.NoAuthHandlerFound:
e = get_exception()
module.fail_json(msg=str(e))
except boto.exception.NoAuthHandlerFound as e:
module.fail_json(msg=to_native(e), exception=traceback.format_exc())
if not message_structure == 'string' and message_attributes:
module.fail_json(msg="when specifying message_attributes, the message_structure must be set to 'string'; otherwise the attributes will not be sent.")
@@ -237,11 +234,11 @@ def main():
connection.publish(topic=arn_topic, subject=subject,
message_structure=message_structure, message=json_msg,
message_attributes=message_attributes)
except boto.exception.BotoServerError:
e = get_exception()
module.fail_json(msg=str(e))
except boto.exception.BotoServerError as e:
module.fail_json(msg=to_native(e), exception=traceback.format_exc())
module.exit_json(msg="OK")
if __name__ == '__main__':
main()