From c1b3a835141ae404f3ecafd856ba63c307d18688 Mon Sep 17 00:00:00 2001 From: Mohammadreza Asadollahifard Date: Fri, 11 Jul 2025 21:19:16 +0100 Subject: [PATCH] refactor: clean up color output imports in list, root, and status files Signed-off-by: Mohammadreza Asadollahifard --- pkg/cmd/list.go | 2 +- pkg/cmd/root.go | 6 +++--- pkg/cmd/status.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go index a0041d16c..55d828036 100644 --- a/pkg/cmd/list.go +++ b/pkg/cmd/list.go @@ -26,9 +26,9 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" + coloroutput "helm.sh/helm/v4/internal/cli/output" "helm.sh/helm/v4/pkg/action" "helm.sh/helm/v4/pkg/cli/output" - coloroutput "helm.sh/helm/v4/internal/cli/output" "helm.sh/helm/v4/pkg/cmd/require" release "helm.sh/helm/v4/pkg/release/v1" ) diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go index 3d0180d86..f43ce7abe 100644 --- a/pkg/cmd/root.go +++ b/pkg/cmd/root.go @@ -177,7 +177,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg flags.Parse(args) logSetup(settings.Debug) - + // Validate color mode setting switch settings.ColorMode { case "never", "auto", "always": @@ -185,7 +185,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg default: return nil, fmt.Errorf("invalid color mode %q: must be one of: never, auto, always", settings.ColorMode) } - + // Configure color output based on ColorMode setting configureColorOutput(settings) @@ -193,7 +193,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg _ = cmd.RegisterFlagCompletionFunc("color", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { return []string{"never", "auto", "always"}, cobra.ShellCompDirectiveNoFileComp }) - + // Setup shell completion for the colour flag _ = cmd.RegisterFlagCompletionFunc("colour", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { return []string{"never", "auto", "always"}, cobra.ShellCompDirectiveNoFileComp diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go index 3198d468f..aa836f9f3 100644 --- a/pkg/cmd/status.go +++ b/pkg/cmd/status.go @@ -28,10 +28,10 @@ import ( "k8s.io/kubectl/pkg/cmd/get" + coloroutput "helm.sh/helm/v4/internal/cli/output" "helm.sh/helm/v4/pkg/action" chartutil "helm.sh/helm/v4/pkg/chart/v2/util" "helm.sh/helm/v4/pkg/cli/output" - coloroutput "helm.sh/helm/v4/internal/cli/output" "helm.sh/helm/v4/pkg/cmd/require" release "helm.sh/helm/v4/pkg/release/v1" )