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

sns: move from notification directory to cloud/amazon directory - fixes #11874 (#23805)

Browse source 
* move sns to cloud directory

* make sns pep8 and remove from legacy files
This commit is contained in:
Sloane Hertel 2017-05-02 10:05:48 -04:00 committed by GitHub
parent 9d9e9a79e2
commit fcaa49b536
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/notification/sns.py → lib/ansible/modules/cloud/amazon/sns.py
View file

@ -200,9 +200,9 @@ def main():
e = get_exception() e = get_exception()
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
if not message_structure=='string' and message_attributes: 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.") module.fail_json(msg="when specifying message_attributes, the message_structure must be set to 'string'; otherwise the attributes will not be sent.")
elif message_structure=='string' and (email or sqs or sms or http or https): elif message_structure == 'string' and (email or sqs or sms or http or https):
module.fail_json(msg="do not specify non-default message formats when using the 'string' message_structure. they can only be used with " module.fail_json(msg="do not specify non-default message formats when using the 'string' message_structure. they can only be used with "
"the 'json' message_structure.") "the 'json' message_structure.")

1
test/sanity/pep8/legacy-files.txt
View file

@ -634,7 +634,6 @@ lib/ansible/modules/notification/pushover.py
lib/ansible/modules/notification/rocketchat.py lib/ansible/modules/notification/rocketchat.py
lib/ansible/modules/notification/sendgrid.py lib/ansible/modules/notification/sendgrid.py
lib/ansible/modules/notification/slack.py lib/ansible/modules/notification/slack.py
lib/ansible/modules/notification/sns.py
lib/ansible/modules/notification/twilio.py lib/ansible/modules/notification/twilio.py
lib/ansible/modules/packaging/language/bundler.py lib/ansible/modules/packaging/language/bundler.py
lib/ansible/modules/packaging/language/cpanm.py lib/ansible/modules/packaging/language/cpanm.py