fix: remove multi-az flag from the cluster scale command, as that is a (#92)

create-only field

Author: Davidonium

internal/cmd/cluster/scale.go

@@ -58,7 +58,6 @@ match.`,
 			cmd.Flags().Var(new(resource.ByteQuantity), "ram", "RAM per node (e.g. \"8\", \"8G\", \"8Gi\", or \"8GiB\")")
 			cmd.Flags().Var(new(resource.ByteQuantity), "disk", "Total disk size per node (e.g. \"200GiB\"); if larger than the node's included disk, the difference is provisioned as additional storage")
 			cmd.Flags().Var(new(resource.Millicores), "gpu", "Number of GPUs per node (e.g. \"1\", \"2\", or \"1000m\")")
-			cmd.Flags().Bool("multi-az", false, "Schedule nodes in multiple availability zones")
 			cmd.Flags().Bool("wait", false, "Wait for the cluster to become healthy")
 			cmd.Flags().Duration("wait-timeout", 10*time.Minute, "Maximum time to wait for cluster health")
 			cmd.Flags().Duration("wait-poll-interval", 5*time.Second, "How often to poll for cluster health")
@@ -150,17 +149,12 @@ match.`,
 			}
 
 			multiAz := currentPkg.GetPackage().GetMultiAz()
-			if cmd.Flags().Changed("multi-az") {
-				multiAz, _ = cmd.Flags().GetBool("multi-az")
-			}
 
 			// If no resource flags changed, keep the current package — avoids a
 			// ListPackages round-trip and prevents spurious failures when the current
 			// package is deprecated or shares specs with another active package.
 			var newPkg *bookingv1.Package
-			if cmd.Flags().Changed("cpu") || cmd.Flags().Changed("ram") || cmd.Flags().Changed("gpu") || cmd.Flags().Changed("multi-az") {
-				// scale doesn't allow changing multi-az so any new package selected needs to
-				// use the same multi-az value
+			if util.AnyFlagChanged(cmd, []string{"cpu", "ram", "gpu"}) {
 				newPkg, err = clusterutil.ResolvePackageByResources(ctx, client.Booking(), clusterutil.PackageResourceQuery{
 					AccountID:     accountID,
 					CloudProvider: cluster.CloudProviderId,
@@ -336,13 +330,12 @@ func scaleConfirmPrompt(
 	}
 
 	prompt := fmt.Sprintf(
-		"Cluster %s (%s) will be scaled to:\n  Nodes:   %s\n  CPU:     %s\n  RAM:     %s\n  Disk:    %s\n  Multi AZ: %s",
+		"Cluster %s (%s) will be scaled to:\n  Nodes:   %s\n  CPU:     %s\n  RAM:     %s\n  Disk:    %s",
 		cluster.GetId(), cluster.GetName(),
 		output.DiffValue(fmt.Sprintf("%d", oldNodes), fmt.Sprintf("%d", cluster.Configuration.NumberOfNodes)),
 		output.DiffValue(oldRC.GetCpu(), newRC.GetCpu()),
 		output.DiffValue(oldRC.GetRam(), newRC.GetRam()),
 		diskLine,
-		output.DiffValue(output.BoolYesNo(oldPkg.GetMultiAz()), output.BoolYesNo(newPkg.GetMultiAz())),
 	)
 	if oldRC.GetGpu() != "" || newRC.GetGpu() != "" {
 		prompt += fmt.Sprintf("\n  GPU:     %s", output.DiffValue(oldRC.GetGpu(), newRC.GetGpu()))

internal/cmd/cluster/scale_test.go

@@ -55,19 +55,6 @@ func newPkg(id, cpu, ram, disk string) *bookingv1.Package {
 	}
 }
 
-func newMultiAzPkg(id, cpu, ram, disk string) *bookingv1.Package {
-	return &bookingv1.Package{
-		Id:   id,
-		Name: id,
-		ResourceConfiguration: &bookingv1.ResourceConfiguration{
-			Cpu:  cpu,
-			Ram:  ram,
-			Disk: disk,
-		},
-		MultiAz: true,
-	}
-}
-
 type scaleEnv struct {
 	cluster    *clusterv1.Cluster
 	currentPkg *bookingv1.Package
@@ -237,36 +224,18 @@ func TestScale_AbortWithoutForce(t *testing.T) {
 	assert.Equal(t, 0, env.Server.UpdateClusterCalls.Count())
 }
 
-func TestScale_ConfirmPromptShowsDiskAndMultiAzCorrectly(t *testing.T) {
+func TestScale_ConfirmPromptShowsDiskCorrectly(t *testing.T) {
 	env := testutil.NewTestEnv(t)
 	setupScale(env, scaleEnv{
 		cluster:    baseCluster(),
 		currentPkg: newPkg(pkgID1, "1000m", "4GiB", "50GiB"),
-		newPkg:     newMultiAzPkg(pkgID2, "2000m", "4GiB", "50GiB"),
+		newPkg:     newPkg(pkgID2, "2000m", "4GiB", "50GiB"),
 	})
 
-	_, stderr, err := testutil.Exec(t, env, "cluster", "scale", "cluster-123", "--cpu", "2", "--multi-az")
+	_, stderr, err := testutil.Exec(t, env, "cluster", "scale", "cluster-123", "--cpu", "2")
 	require.NoError(t, err)
 
 	assert.Contains(t, stderr, "Disk:    50GiB")
-	assert.Contains(t, stderr, "Multi AZ: no => yes")
-}
-
-func TestScale_MultiAz(t *testing.T) {
-	env := testutil.NewTestEnv(t)
-	setupScale(env, scaleEnv{
-		cluster:    baseCluster(),
-		currentPkg: newPkg(pkgID1, "1000m", "4GiB", "50GiB"),
-		newPkg:     newMultiAzPkg(pkgID2, "2000m", "4GiB", "50GiB"),
-	})
-
-	_, _, err := testutil.Exec(t, env, "cluster", "scale", "cluster-123", "--cpu", "2", "--multi-az", "--force")
-	require.NoError(t, err)
-
-	req, ok := env.Server.UpdateClusterCalls.Last()
-	require.True(t, ok)
-	assert.Equal(t, pkgID2, req.GetCluster().GetConfiguration().GetPackageId())
-	assert.Equal(t, 1, env.BookingServer.ListPackagesCalls.Count())
 }
 
 func TestScale_MissingClusterID(t *testing.T) {