From 86aafae08958d3649cd7ba8c50866bff7ba66035 Mon Sep 17 00:00:00 2001 From: Curtis Date: Tue, 9 Feb 2021 22:06:58 -0600 Subject: [PATCH] merge conflict fix --- aws/resource_aws_sns_topic_subscription.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_sns_topic_subscription.go b/aws/resource_aws_sns_topic_subscription.go index c61c48db48f..3df3d4a4fcf 100644 --- a/aws/resource_aws_sns_topic_subscription.go +++ b/aws/resource_aws_sns_topic_subscription.go @@ -158,12 +158,6 @@ func resourceAwsSnsTopicSubscriptionUpdate(d *schema.ResourceData, meta interfac } } - if d.HasChange("redrive_policy") { - if err := snsSubscriptionAttributeUpdate(snsconn, d.Id(), "RedrivePolicy", d.Get("redrive_policy").(string)); err != nil { - return err - } - } - if d.HasChange("subscription_role_arn") { protocol := d.Get("protocol").(string) subscription_role_arn := d.Get("subscription_role_arn").(string) @@ -179,6 +173,12 @@ func resourceAwsSnsTopicSubscriptionUpdate(d *schema.ResourceData, meta interfac } } + if d.HasChange("redrive_policy") { + if err := snsSubscriptionAttributeUpdate(snsconn, d.Id(), "RedrivePolicy", d.Get("redrive_policy").(string)); err != nil { + return err + } + } + return resourceAwsSnsTopicSubscriptionRead(d, meta) }