fixup! [CC-30640] allow manual version control for standard clusters

cockroachdb · Dec 5, 2024 · d54a3d0 · d54a3d0
1 parent 4914afc
commit d54a3d0
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/internal/provider/cluster_resource.go b/internal/provider/cluster_resource.go
@@ -845,17 +845,17 @@ func (r *clusterResource) Update(
 			if stateUpgradeTypeString != planUpgradeTypeString {
 				resp.Diagnostics.AddError("Error updating cluster", "upgrade_type and version must not be changed during the same plan.")
 				return
-			} else {
-				stateUpgradeTypePtr, err := client.NewUpgradeTypeTypeFromValue(stateUpgradeTypeString)
-				if err != nil {
-					resp.Diagnostics.AddError("Error updating cluster", err.Error())
-					return
-				}
-				stateUpgradeType := *stateUpgradeTypePtr
-				if stateUpgradeType != client.UPGRADETYPETYPE_MANUAL {
-					resp.Diagnostics.AddError("Error updating cluster", "upgrade_type must be set to MANUAL before setting cockroach_version.")
-					return
-				}
+			}
+
+			stateUpgradeTypePtr, err := client.NewUpgradeTypeTypeFromValue(stateUpgradeTypeString)
+			if err != nil {
+				resp.Diagnostics.AddError("Error updating cluster", err.Error())
+				return
+			}
+			stateUpgradeType := *stateUpgradeTypePtr
+			if stateUpgradeType != client.UPGRADETYPETYPE_MANUAL {
+				resp.Diagnostics.AddError("Error updating cluster", "upgrade_type must be set to MANUAL before setting cockroach_version.")
+				return
 			}
 		}