wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sns_topic: Do not attempt to unsubscribed deleted subscriptions (#20086)

Browse source
This commit is contained in:
Michał Masłowski 2017-01-11 12:57:24 +01:00 committed by Ryan Brown
parent 8fe09d4ea9
commit 5a1395a486
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/amazon/sns_topic.py
View file

@ -276,7 +276,7 @@ class SnsTopicManager(object):
sub_key = (sub['Protocol'], sub['Endpoint'])
subscriptions_existing_list.append(sub_key)
if self.purge_subscriptions and sub_key not in desired_subscriptions and \
sub['SubscriptionArn'] != 'PendingConfirmation':
sub['SubscriptionArn'] not in ('PendingConfirmation', 'Deleted'):
self.changed = True
self.subscriptions_deleted.append(sub_key)
if not self.check_mode:
@ -294,7 +294,7 @@ class SnsTopicManager(object):
# NOTE: subscriptions in 'PendingConfirmation' timeout in 3 days
# https://forums.aws.amazon.com/thread.jspa?threadID=85993
for sub in self.subscriptions_existing:
if sub['SubscriptionArn'] != 'PendingConfirmation':
if sub['SubscriptionArn'] not in ('PendingConfirmation', 'Deleted'):
self.subscriptions_deleted.append(sub['SubscriptionArn'])
self.changed = True
if not self.check_mode: