Merge pull request #10539 from spavuluri/5204-cloudformation-onfailure

Added check for on_failure before resetting disable_rollback during refresh
hashicorp · May 28, 2021 · be7b9ad · be7b9ad
2 parents f3acf30 + 3a6313c
commit be7b9ad
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 67 deletions.
diff --git a/.changelog/10539.txt b/.changelog/10539.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_cloudformation_stack: Avoid conflicts with `on_failure` and `disable_rollback`
+```
diff --git a/aws/resource_aws_cloudformation_stack.go b/aws/resource_aws_cloudformation_stack.go
@@ -261,6 +261,12 @@ func resourceAwsCloudFormationStackRead(d *schema.ResourceData, meta interface{}
 	}
 	if stack.DisableRollback != nil {
 		d.Set("disable_rollback", stack.DisableRollback)
+
+		// takes into account that disable_rollback conflicts with on_failure and
+		// prevents forced new creation if disable_rollback is reset during refresh
+		if d.Get("on_failure") != nil {
+			d.Set("disable_rollback", false)
+		}
 	}
 	if len(stack.NotificationARNs) > 0 {
 		err = d.Set("notification_arns", flattenStringSet(stack.NotificationARNs))