Allow empty rollback block. (#13758) (#22501)

[upstream:85c6a040b70cd04c7469028dc135c83276b443ea]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13758.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+clouddeploy: allowed sending empty block for `rollback` field  in  `google_clouddeploy_automation` resource.
+```

google/services/clouddeploy/resource_clouddeploy_automation.go

@@ -110,6 +110,7 @@ func ResourceClouddeployAutomation() *schema.Resource {
 									},
 								},
 							},
+							ExactlyOneOf: []string{},
 						},
 						"promote_release_rule": {
 							Type:        schema.TypeList,
@@ -140,6 +141,7 @@ func ResourceClouddeployAutomation() *schema.Resource {
 									},
 								},
 							},
+							ExactlyOneOf: []string{},
 						},
 						"repair_rollout_rule": {
 							Type:        schema.TypeList,
@@ -200,6 +202,7 @@ func ResourceClouddeployAutomation() *schema.Resource {
 															},
 														},
 													},
+													ExactlyOneOf: []string{},
 												},
 												"rollback": {
 													Type:        schema.TypeList,
@@ -220,12 +223,14 @@ func ResourceClouddeployAutomation() *schema.Resource {
 															},
 														},
 													},
+													ExactlyOneOf: []string{},
 												},
 											},
 										},
 									},
 								},
 							},
+							ExactlyOneOf: []string{},
 						},
 						"timed_promote_release_rule": {
 							Type:        schema.TypeList,
@@ -263,6 +268,7 @@ func ResourceClouddeployAutomation() *schema.Resource {
 									},
 								},
 							},
+							ExactlyOneOf: []string{},
 						},
 					},
 				},
@@ -1057,9 +1063,6 @@ func flattenClouddeployAutomationRulesRepairRolloutRuleRepairPhasesRollback(v in
 		return nil
 	}
 	original := v.(map[string]interface{})
-	if len(original) == 0 {
-		return nil
-	}
 	transformed := make(map[string]interface{})
 	transformed["destination_phase"] =
 		flattenClouddeployAutomationRulesRepairRolloutRuleRepairPhasesRollbackDestinationPhase(original["destinationPhase"], d, config)
@@ -1430,7 +1433,7 @@ func expandClouddeployAutomationRulesRepairRolloutRuleRepairPhases(v interface{}
 		transformedRollback, err := expandClouddeployAutomationRulesRepairRolloutRuleRepairPhasesRollback(original["rollback"], d, config)
 		if err != nil {
 			return nil, err
-		} else if val := reflect.ValueOf(transformedRollback); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		} else {
 			transformed["rollback"] = transformedRollback
 		}
 
@@ -1486,9 +1489,14 @@ func expandClouddeployAutomationRulesRepairRolloutRuleRepairPhasesRetryBackoffMo
 
 func expandClouddeployAutomationRulesRepairRolloutRuleRepairPhasesRollback(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
-	if len(l) == 0 || l[0] == nil {
+	if len(l) == 0 {
 		return nil, nil
 	}
+
+	if l[0] == nil {
+		transformed := make(map[string]interface{})
+		return transformed, nil
+	}
 	raw := l[0]
 	original := raw.(map[string]interface{})
 	transformed := make(map[string]interface{})

google/services/clouddeploy/resource_clouddeploy_automation_generated_test.go

@@ -70,12 +70,36 @@ resource "google_clouddeploy_automation" "b-automation" {
       id = "*"
     }
   }
-  suspended = false
   rules {
     promote_release_rule {
       id = "promote-release"
     }
   }
+  rules {
+      advance_rollout_rule {
+        id                    = "advance-rollout"
+      }
+    }
+  rules {
+    repair_rollout_rule {
+      id                    = "repair-rollout"
+      repair_phases {
+      retry  {
+                      attempts = "1"
+                  }
+       }
+      repair_phases {
+             rollback {}
+          }
+      }
+  }
+  rules {
+    timed_promote_release_rule {
+      id                    = "timed-promote-release"
+      schedule              = "0 9 * * 1"
+      time_zone              = "America/New_York"
+     }
+  }
 }
 
 resource "google_clouddeploy_delivery_pipeline" "pipeline" {

google/services/clouddeploy/resource_clouddeploy_automation_test.go

@@ -58,13 +58,36 @@ resource "google_clouddeploy_automation" "automation" {
       id = "*"
       labels = {}
     }
+  }
+    rules {
+    promote_release_rule {
+      id = "promote-release"
+    }
   }
   rules {
-    advance_rollout_rule {
-      id                    = "advance-rollout"
-      source_phases         = ["deploy"]
-      wait                  = "200s"
+      advance_rollout_rule {
+        id                    = "advance-rollout"
+      }
     }
+  rules {
+    repair_rollout_rule {
+      id                    = "repair-rollout"
+      repair_phases {
+      retry  {
+                      attempts = "1"
+                  }
+       }
+      repair_phases {
+             rollback {}
+          }
+      }
+  }
+  rules {
+    timed_promote_release_rule {
+      id                    = "timed-promote-release"
+      schedule              = "0 9 * * 1"
+      time_zone              = "America/New_York"
+     }
   }
 }
 
@@ -137,6 +160,7 @@ resource "google_clouddeploy_automation" "automation" {
       repair_phases {
              rollback {
                          destination_phase = "stable"
+                         disable_rollback_if_rollout_pending = true
                       }
           }
     }

website/docs/r/clouddeploy_automation.html.markdown

@@ -45,12 +45,36 @@ resource "google_clouddeploy_automation" "b-automation" {
       id = "*"
     }
   }
-  suspended = false
   rules {
     promote_release_rule {
       id = "promote-release"
     }
   }
+  rules {
+      advance_rollout_rule {
+        id                    = "advance-rollout"
+      }
+    }
+  rules {
+    repair_rollout_rule {
+      id                    = "repair-rollout"
+      repair_phases {
+      retry  {
+                      attempts = "1"
+                  }
+       }
+      repair_phases {
+             rollback {}
+          }
+      }
+  }
+  rules {
+    timed_promote_release_rule {
+      id                    = "timed-promote-release"
+      schedule              = "0 9 * * 1"
+      time_zone              = "America/New_York"
+     }
+  }
 }
 
 resource "google_clouddeploy_delivery_pipeline" "pipeline" {