From b37a283dfb3f9f9399569bd8038a8942fe75fbbc Mon Sep 17 00:00:00 2001 From: Jan Tytgat Date: Mon, 9 Jun 2025 22:36:45 +0200 Subject: [PATCH] Refactor flags Signed-off-by: Jan Tytgat --- application/globals.go | 2 +- application/output.go | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/application/globals.go b/application/globals.go index 0fc03f8..67b5d37 100644 --- a/application/globals.go +++ b/application/globals.go @@ -50,7 +50,7 @@ func persistentPreRunFuncE(cmd *cobra.Command, args []string) error { slogd.FromContext(cmd.Context()).Log(cmd.Context(), slogd.LevelTrace, "executing PersistentPreRun") // Make sure we can always get the version - if versionFlag.Value || cmd.CommandPath() == strings.Join([]string{appName, versionName}, " ") { + if versionFlag.Value || cmd.CommandPath() == strings.Join([]string{appName, versionFlagName}, " ") { slogd.FromContext(cmd.Context()).LogAttrs(cmd.Context(), slogd.LevelTrace, "overriding command", slog.String("old_function", runtime.FuncForPC(reflect.ValueOf(cmd.RunE).Pointer()).Name()), slog.String("new_function", runtime.FuncForPC(reflect.ValueOf(versionRunFuncE).Pointer()).Name())) cmd.RunE = versionRunFuncE return nil diff --git a/application/output.go b/application/output.go index 89c68b9..553e836 100644 --- a/application/output.go +++ b/application/output.go @@ -8,8 +8,12 @@ import ( ) const ( - quietFlagShortCode = "q" - verboseFlagShortCode = "v" + jsonOutputFlagDefault = false + noColorFlagDefault = false + quietFlagDefault = false + quietFlagShortCode = "q" + verboseFlagDefault = false + verboseFlagShortCode = "v" ) var ( @@ -20,19 +24,19 @@ var ( ) func addJsonOutputFlag(cmd *cobra.Command) { - cmd.PersistentFlags().BoolVarP(&jsonOutputFlag.Value, jsonOutputFlag.Name(), "", false, jsonOutputFlag.Usage()) + cmd.PersistentFlags().BoolVarP(&jsonOutputFlag.Value, jsonOutputFlag.Name(), "", jsonOutputFlagDefault, jsonOutputFlag.Usage()) } func addNoColorFlag(cmd *cobra.Command) { - cmd.PersistentFlags().BoolVarP(&noColorFlag.Value, noColorFlag.Name(), "", false, noColorFlag.Usage()) + cmd.PersistentFlags().BoolVarP(&noColorFlag.Value, noColorFlag.Name(), "", noColorFlagDefault, noColorFlag.Usage()) } func addQuietFlag(cmd *cobra.Command) { - cmd.PersistentFlags().BoolVarP(&quietFlag.Value, quietFlag.Name(), quietFlagShortCode, false, quietFlag.Usage()) + cmd.PersistentFlags().BoolVarP(&quietFlag.Value, quietFlag.Name(), quietFlagShortCode, quietFlagDefault, quietFlag.Usage()) } func addVerboseFlag(cmd *cobra.Command) { - cmd.PersistentFlags().BoolVarP(&verboseFlag.Value, verboseFlag.Name(), verboseFlagShortCode, false, verboseFlag.Usage()) + cmd.PersistentFlags().BoolVarP(&verboseFlag.Value, verboseFlag.Name(), verboseFlagShortCode, verboseFlagDefault, verboseFlag.Usage()) } func configureOutputFlags(cmd *cobra.Command) {