diff --git a/cmd/cca/cca.go b/cmd/cca/cca.go index 2d24228..146aa01 100644 --- a/cmd/cca/cca.go +++ b/cmd/cca/cca.go @@ -48,8 +48,8 @@ func NewCommand() *cobra.Command { cmd.PersistentFlags().StringVar(&flags.APIURL, "api-url", cmdutil.DefaultAPIURL, "API url cloud.ca resources") cmd.PersistentFlags().StringVar(&flags.APIKey, "api-key", "", "API Key to access cloud.ca resources") - cmd.PersistentFlags().StringVar(&flags.OutputFormat, "output", cmdutil.DefaultOutputFormat, "output format "+output.FormatString()) - cmd.PersistentFlags().BoolVar(new(bool), "nocolor", false, "Disable colored output") + cmd.PersistentFlags().StringVar(&flags.OutputFormat, "output-format", cmdutil.DefaultOutputFormat, "output format "+output.FormatStrings()) + cmd.PersistentFlags().BoolVar(&flags.OutputColored, "output-colored", false, "Enable or disable colored output") cmd.PersistentFlags().StringVar(&flags.LogLevel, "loglevel", cmdutil.DefaultLogLevel.String(), "log level "+logutil.LevelsString()) cmd.AddCommand(completion.NewCommand(flags)) diff --git a/pkg/cmdutil/flags.go b/pkg/cmdutil/flags.go index bc4a792..748d339 100644 --- a/pkg/cmdutil/flags.go +++ b/pkg/cmdutil/flags.go @@ -28,6 +28,7 @@ type GlobalFlags struct { ColorOutput bool EnvironmentID string LogLevel string + OutputColored bool OutputFormat string } diff --git a/pkg/output/util.go b/pkg/output/util.go index 4905ef5..e68ab35 100644 --- a/pkg/output/util.go +++ b/pkg/output/util.go @@ -22,9 +22,9 @@ func Has(format string) bool { return false } -// FormatString returns a string representing all output formats +// FormatStrings returns a string representing all output formats. // this is useful for help text / flag info -func FormatString() string { +func FormatStrings() string { var b strings.Builder b.WriteString("[") for i, format := range outputFormats {