merge conflict fix

hashicorp · Feb 25, 2021 · 86aafae · 86aafae
1 parent 6989024
commit 86aafae
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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)
 }