EVEREST-1790 Extend help message for CLI namespace update command

percona · Jan 13, 2025 · b668ff3 · b668ff3
1 parent e7ff34e
commit b668ff3
Showing 1 changed file with 81 additions and 85 deletions.
diff --git a/commands/namespaces/update.go b/commands/namespaces/update.go
@@ -2,101 +2,97 @@
 package namespaces
 
 import (
-	"fmt"
-	"os"
+    "os"
 
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"go.uber.org/zap"
+    "github.com/spf13/cobra"
+    "github.com/spf13/viper"
+    "go.uber.org/zap"
 
-	"github.com/percona/everest/pkg/cli"
-	"github.com/percona/everest/pkg/cli/helm"
-	"github.com/percona/everest/pkg/cli/namespaces"
-	"github.com/percona/everest/pkg/output"
+    "github.com/percona/everest/pkg/cli"
+    "github.com/percona/everest/pkg/cli/helm"
+    "github.com/percona/everest/pkg/cli/namespaces"
+    "github.com/percona/everest/pkg/output"
 )
 
 // NewUpdateCommand returns a new command to update an existing namespace.
 func NewUpdateCommand(l *zap.SugaredLogger) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "update",
-		Long:    "Update an existing Everest namespace",
-		Short:   "Update an existing Everest namespace",
-		Example: `everestctl update add [NAMESPACE] [FLAGS]`,
-		Run: func(cmd *cobra.Command, args []string) {
-			initUpdateViperFlags(cmd)
-			c := &namespaces.NamespaceAddConfig{}
-			err := viper.Unmarshal(c)
-			if err != nil {
-				l.Error(err)
-				return
-			}
-			bindInstallHelmOpts(c)
-			c.Update = true
-
-			if len(args) != 1 {
-				output.PrintError(fmt.Errorf("invalid number of arguments: expected 1, got %d", len(args)), l, true)
-				os.Exit(1)
-			}
-			c.Namespaces = args[0]
-
-			enableLogging := viper.GetBool("verbose") || viper.GetBool("json")
-			c.Pretty = !enableLogging
-
-			askOperators := !(cmd.Flags().Lookup("operator.mongodb").Changed ||
-				cmd.Flags().Lookup("operator.postgresql").Changed ||
-				cmd.Flags().Lookup("operator.xtradb-cluster").Changed)
-
-			if err := c.Populate(cmd.Context(), false, askOperators); err != nil {
-				output.PrintError(err, l, !enableLogging)
-				os.Exit(1)
-			}
-
-			op, err := namespaces.NewNamespaceAdd(*c, l)
-			if err != nil {
-				output.PrintError(err, l, !enableLogging)
-				return
-			}
-			if err := op.Run(cmd.Context()); err != nil {
-				output.PrintError(err, l, !enableLogging)
-				os.Exit(1)
-			}
-		},
-	}
-	initUpdateFlags(cmd)
-	return cmd
+    cmd := &cobra.Command{
+        Use:     "update [flags] NAMESPACES",
+        Long:    "Add database operator to existing namespace managed by Everest",
+        Short:   "Add database operator to existing namespace managed by Everest",
+        Example: `everestctl namespaces update --operator.mongodb=true --skip-wizard ns-1,ns-2`,
+        Args:    cobra.ExactArgs(1),
+        Run: func(cmd *cobra.Command, args []string) {
+            initUpdateViperFlags(cmd)
+            c := &namespaces.NamespaceAddConfig{}
+            err := viper.Unmarshal(c)
+            if err != nil {
+                l.Error(err)
+                return
+            }
+            bindInstallHelmOpts(c)
+            c.Update = true
+
+            c.Namespaces = args[0]
+
+            enableLogging := viper.GetBool("verbose") || viper.GetBool("json")
+            c.Pretty = !enableLogging
+
+            askOperators := !(cmd.Flags().Lookup("operator.mongodb").Changed ||
+                cmd.Flags().Lookup("operator.postgresql").Changed ||
+                cmd.Flags().Lookup("operator.xtradb-cluster").Changed)
+
+            if err := c.Populate(cmd.Context(), false, askOperators); err != nil {
+                output.PrintError(err, l, !enableLogging)
+                os.Exit(1)
+            }
+
+            op, err := namespaces.NewNamespaceAdd(*c, l)
+            if err != nil {
+                output.PrintError(err, l, !enableLogging)
+                return
+            }
+            if err := op.Run(cmd.Context()); err != nil {
+                output.PrintError(err, l, !enableLogging)
+                os.Exit(1)
+            }
+        },
+    }
+    initUpdateFlags(cmd)
+    return cmd
 }
 
 func initUpdateFlags(cmd *cobra.Command) {
-	cmd.Flags().Bool(cli.FlagDisableTelemetry, false, "Disable telemetry")
-	cmd.Flags().MarkHidden(cli.FlagDisableTelemetry) //nolint:errcheck,gosec
-	cmd.Flags().Bool(cli.FlagSkipWizard, false, "Skip installation wizard")
-
-	cmd.Flags().String(helm.FlagChartDir, "", "Path to the chart directory. If not set, the chart will be downloaded from the repository")
-	cmd.Flags().MarkHidden(helm.FlagChartDir) //nolint:errcheck,gosec
-	cmd.Flags().String(helm.FlagRepository, helm.DefaultHelmRepoURL, "Helm chart repository to download the Everest charts from")
-	cmd.Flags().StringSlice(helm.FlagHelmSet, []string{}, "Set helm values on the command line (can specify multiple values with commas: key1=val1,key2=val2)")
-	cmd.Flags().StringSliceP(helm.FlagHelmValues, "f", []string{}, "Specify values in a YAML file or a URL (can specify multiple)")
-
-	cmd.Flags().Bool(cli.FlagOperatorMongoDB, true, "Install MongoDB operator")
-	cmd.Flags().Bool(cli.FlagOperatorPostgresql, true, "Install PostgreSQL operator")
-	cmd.Flags().Bool(cli.FlagOperatorXtraDBCluster, true, "Install XtraDB Cluster operator")
+    cmd.Flags().Bool(cli.FlagDisableTelemetry, false, "Disable telemetry")
+    cmd.Flags().MarkHidden(cli.FlagDisableTelemetry) //nolint:errcheck,gosec
+    cmd.Flags().Bool(cli.FlagSkipWizard, false, "Skip installation wizard")
+
+    cmd.Flags().String(helm.FlagChartDir, "", "Path to the chart directory. If not set, the chart will be downloaded from the repository")
+    cmd.Flags().MarkHidden(helm.FlagChartDir) //nolint:errcheck,gosec
+    cmd.Flags().String(helm.FlagRepository, helm.DefaultHelmRepoURL, "Helm chart repository to download the Everest charts from")
+    cmd.Flags().StringSlice(helm.FlagHelmSet, []string{}, "Set helm values on the command line (can specify multiple values with commas: key1=val1,key2=val2)")
+    cmd.Flags().StringSliceP(helm.FlagHelmValues, "f", []string{}, "Specify values in a YAML file or a URL (can specify multiple)")
+
+    cmd.Flags().Bool(cli.FlagOperatorMongoDB, true, "Install MongoDB operator")
+    cmd.Flags().Bool(cli.FlagOperatorPostgresql, true, "Install PostgreSQL operator")
+    cmd.Flags().Bool(cli.FlagOperatorXtraDBCluster, true, "Install XtraDB Cluster operator")
 }
 
 func initUpdateViperFlags(cmd *cobra.Command) {
-	viper.BindPFlag(cli.FlagSkipWizard, cmd.Flags().Lookup(cli.FlagSkipWizard))             //nolint:errcheck,gosec
-	viper.BindPFlag(cli.FlagDisableTelemetry, cmd.Flags().Lookup(cli.FlagDisableTelemetry)) //nolint:errcheck,gosec
-
-	viper.BindPFlag(helm.FlagChartDir, cmd.Flags().Lookup(helm.FlagChartDir))     //nolint:errcheck,gosec
-	viper.BindPFlag(helm.FlagRepository, cmd.Flags().Lookup(helm.FlagRepository)) //nolint:errcheck,gosec
-	viper.BindPFlag(helm.FlagHelmSet, cmd.Flags().Lookup(helm.FlagHelmSet))       //nolint:errcheck,gosec
-	viper.BindPFlag(helm.FlagHelmValues, cmd.Flags().Lookup(helm.FlagHelmValues)) //nolint:errcheck,gosec
-
-	viper.BindPFlag(cli.FlagOperatorMongoDB, cmd.Flags().Lookup("operator.mongodb"))              //nolint:errcheck,gosec
-	viper.BindPFlag(cli.FlagOperatorPostgresql, cmd.Flags().Lookup("operator.postgresql"))        //nolint:errcheck,gosec
-	viper.BindPFlag(cli.FlagOperatorXtraDBCluster, cmd.Flags().Lookup("operator.xtradb-cluster")) //nolint:errcheck,gosec
-
-	viper.BindEnv(cli.FlagKubeconfig)                                           //nolint:errcheck,gosec
-	viper.BindPFlag(cli.FlagKubeconfig, cmd.Flags().Lookup(cli.FlagKubeconfig)) //nolint:errcheck,gosec
-	viper.BindPFlag(cli.FlagVerbose, cmd.Flags().Lookup(cli.FlagVerbose))       //nolint:errcheck,gosec
-	viper.BindPFlag("json", cmd.Flags().Lookup("json"))                         //nolint:errcheck,gosec
+    viper.BindPFlag(cli.FlagSkipWizard, cmd.Flags().Lookup(cli.FlagSkipWizard))             //nolint:errcheck,gosec
+    viper.BindPFlag(cli.FlagDisableTelemetry, cmd.Flags().Lookup(cli.FlagDisableTelemetry)) //nolint:errcheck,gosec
+
+    viper.BindPFlag(helm.FlagChartDir, cmd.Flags().Lookup(helm.FlagChartDir))     //nolint:errcheck,gosec
+    viper.BindPFlag(helm.FlagRepository, cmd.Flags().Lookup(helm.FlagRepository)) //nolint:errcheck,gosec
+    viper.BindPFlag(helm.FlagHelmSet, cmd.Flags().Lookup(helm.FlagHelmSet))       //nolint:errcheck,gosec
+    viper.BindPFlag(helm.FlagHelmValues, cmd.Flags().Lookup(helm.FlagHelmValues)) //nolint:errcheck,gosec
+
+    viper.BindPFlag(cli.FlagOperatorMongoDB, cmd.Flags().Lookup("operator.mongodb"))              //nolint:errcheck,gosec
+    viper.BindPFlag(cli.FlagOperatorPostgresql, cmd.Flags().Lookup("operator.postgresql"))        //nolint:errcheck,gosec
+    viper.BindPFlag(cli.FlagOperatorXtraDBCluster, cmd.Flags().Lookup("operator.xtradb-cluster")) //nolint:errcheck,gosec
+
+    viper.BindEnv(cli.FlagKubeconfig)                                           //nolint:errcheck,gosec
+    viper.BindPFlag(cli.FlagKubeconfig, cmd.Flags().Lookup(cli.FlagKubeconfig)) //nolint:errcheck,gosec
+    viper.BindPFlag(cli.FlagVerbose, cmd.Flags().Lookup(cli.FlagVerbose))       //nolint:errcheck,gosec
+    viper.BindPFlag("json", cmd.Flags().Lookup("json"))                         //nolint:errcheck,gosec
 }