Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix failing aws_ses_identity integration tests #39560

Merged
merged 3 commits into from
May 17, 2018
Merged

Fix failing aws_ses_identity integration tests #39560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7033b15
Fix failing aws_ses_identity integration tests
s-hertel May 1, 2018
70c6ef8
remove unstable test alias
s-hertel May 1, 2018
b7b539d
Update feedback forwarding check to use desired state rather than
orthanc May 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions lib/ansible/modules/cloud/amazon/aws_ses_identity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,15 @@ def get_identity_notifications(connection, module, identity, retries=0, retryDel
return notification_attributes[identity]


def update_notification_topic(connection, module, identity, identity_notifications, notification_type):
def desired_topic(module, notification_type):
arg_dict = module.params.get(notification_type.lower() + '_notifications')
if arg_dict:
return arg_dict.get('topic', None)
else:
return None


def update_notification_topic(connection, module, identity, identity_notifications, notification_type):
topic_key = notification_type + 'Topic'
if identity_notifications is None:
# If there is no configuration for notifications cannot be being sent to topics
Expand All @@ -325,10 +332,7 @@ def update_notification_topic(connection, module, identity, identity_notificatio
# included but best to be defensive
current = None

if arg_dict is not None and 'topic' in arg_dict:
required = arg_dict['topic']
else:
required = None
required = desired_topic(module, notification_type)

if current != required:
call_and_handle_errors(
Expand Down Expand Up @@ -375,6 +379,11 @@ def update_notification_topic_headers(connection, module, identity, identity_not


def update_feedback_forwarding(connection, module, identity, identity_notifications):
if module.params.get('feedback_forwarding') is False:
if not (desired_topic(module, 'Bounce') and desired_topic(module, 'Complaint')):
module.fail_json(msg="Invalid Parameter Value 'False' for 'feedback_forwarding'. AWS requires "
"feedback forwarding to be enabled unless bounces and complaints are handled by SNS topics")

if identity_notifications is None:
# AWS requires feedback forwarding to be enabled unless bounces and complaints
# are being handled by SNS topics. So in the absence of identity_notifications
Expand Down
1 change: 0 additions & 1 deletion test/integration/targets/aws_ses_identity/aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
cloud/aws
posix/ci/cloud/group4/aws
unstable