cli: minor improvements of output

This commit is contained in:
Thomas Tendyck 2022-09-11 16:24:15 +02:00 committed by Thomas Tendyck
parent d83a5f8693
commit 4b36d3a930
7 changed files with 8 additions and 9 deletions

View File

@ -45,9 +45,9 @@ func NewRootCmd() *cobra.Command {
rootCmd.AddCommand(cmd.NewCreateCmd()) rootCmd.AddCommand(cmd.NewCreateCmd())
rootCmd.AddCommand(cmd.NewInitCmd()) rootCmd.AddCommand(cmd.NewInitCmd())
rootCmd.AddCommand(cmd.NewVerifyCmd()) rootCmd.AddCommand(cmd.NewVerifyCmd())
rootCmd.AddCommand(cmd.NewUpgradeCmd())
rootCmd.AddCommand(cmd.NewRecoverCmd()) rootCmd.AddCommand(cmd.NewRecoverCmd())
rootCmd.AddCommand(cmd.NewTerminateCmd()) rootCmd.AddCommand(cmd.NewTerminateCmd())
rootCmd.AddCommand(cmd.NewUpgradeCmd())
rootCmd.AddCommand(cmd.NewVersionCmd()) rootCmd.AddCommand(cmd.NewVersionCmd())
return rootCmd return rootCmd

View File

@ -14,7 +14,7 @@ func NewConfigCmd() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "config", Use: "config",
Short: "Work with the Constellation configuration file", Short: "Work with the Constellation configuration file",
Long: "Generate a configuration file for Constellation.", Long: "Work with the Constellation configuration file.",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
} }

View File

@ -68,8 +68,8 @@ func configGenerate(cmd *cobra.Command, fileHandler file.Handler, provider cloud
return err return err
} }
cmd.Println("Config file written to", flags.file) cmd.Println("Config file written to", flags.file)
cmd.Println("Please fill in your CSP specific configuration before proceeding.") cmd.Println("Please fill in your CSP-specific configuration before proceeding.")
cmd.Println("Fore more information refer to our documentation:") cmd.Println("Fore more information refer to the documentation:")
cmd.Println("\thttps://constellation-docs.edgeless.systems/constellation/getting-started/first-steps#create-a-cluster") cmd.Println("\thttps://constellation-docs.edgeless.systems/constellation/getting-started/first-steps#create-a-cluster")
return nil return nil

View File

@ -17,8 +17,8 @@ import (
func NewConfigInstanceTypesCmd() *cobra.Command { func NewConfigInstanceTypesCmd() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "instance-types", Use: "instance-types",
Short: "Prints the supported instance types for all cloud providers", Short: "Print the supported instance types for all cloud providers",
Long: "Prints the supported instance types for all cloud providers.", Long: "Print the supported instance types for all cloud providers.",
Args: cobra.ArbitraryArgs, Args: cobra.ArbitraryArgs,
Run: printSupportedInstanceTypes, Run: printSupportedInstanceTypes,
} }

View File

@ -138,7 +138,6 @@ func initialize(cmd *cobra.Command, newDialer func(validator *cloudcmd.Validator
autoscalingNodeGroups = append(autoscalingNodeGroups, workers.GroupID) autoscalingNodeGroups = append(autoscalingNodeGroups, workers.GroupID)
} }
cmd.Println("Loading Helm charts ...")
helmDeployments, err := helmLoader.Load(stat.CloudProvider) helmDeployments, err := helmLoader.Load(stat.CloudProvider)
if err != nil { if err != nil {
return fmt.Errorf("loading Helm charts: %w", err) return fmt.Errorf("loading Helm charts: %w", err)

View File

@ -19,8 +19,8 @@ func NewUpgradeCmd() *cobra.Command {
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
} }
cmd.AddCommand(newUpgradeExecuteCmd())
cmd.AddCommand(newUpgradePlanCmd()) cmd.AddCommand(newUpgradePlanCmd())
cmd.AddCommand(newUpgradeExecuteCmd())
return cmd return cmd
} }

View File

@ -45,7 +45,7 @@ func newUpgradePlanCmd() *cobra.Command {
RunE: runUpgradePlan, RunE: runUpgradePlan,
} }
cmd.Flags().StringP("file", "f", "", "path to output file, or '-' for stdout, leave empty for interactive mode") cmd.Flags().StringP("file", "f", "", "path to output file, or '-' for stdout (omit for interactive mode)")
return cmd return cmd
} }