From ba8f70ae0b63198868495f510768747b25ddf042 Mon Sep 17 00:00:00 2001 From: Mohammadreza Asadollahifard Date: Fri, 11 Jul 2025 21:04:27 +0100 Subject: [PATCH] refactor: move color package to internal/cli/output Signed-off-by: Mohammadreza Asadollahifard --- {pkg => internal}/cli/output/color.go | 0 {pkg => internal}/cli/output/color_test.go | 0 pkg/cmd/list.go | 17 +++++++++-------- pkg/cmd/status.go | 5 +++-- 4 files changed, 12 insertions(+), 10 deletions(-) rename {pkg => internal}/cli/output/color.go (100%) rename {pkg => internal}/cli/output/color_test.go (100%) diff --git a/pkg/cli/output/color.go b/internal/cli/output/color.go similarity index 100% rename from pkg/cli/output/color.go rename to internal/cli/output/color.go diff --git a/pkg/cli/output/color_test.go b/internal/cli/output/color_test.go similarity index 100% rename from pkg/cli/output/color_test.go rename to internal/cli/output/color_test.go diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go index 016d7663a..a0041d16c 100644 --- a/pkg/cmd/list.go +++ b/pkg/cmd/list.go @@ -28,6 +28,7 @@ import ( "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" ) @@ -181,13 +182,13 @@ func (w *releaseListWriter) WriteTable(out io.Writer) error { table := uitable.New() if !w.noHeaders { table.AddRow( - output.ColorizeHeader("NAME", w.noColor), - output.ColorizeHeader("NAMESPACE", w.noColor), - output.ColorizeHeader("REVISION", w.noColor), - output.ColorizeHeader("UPDATED", w.noColor), - output.ColorizeHeader("STATUS", w.noColor), - output.ColorizeHeader("CHART", w.noColor), - output.ColorizeHeader("APP VERSION", w.noColor), + coloroutput.ColorizeHeader("NAME", w.noColor), + coloroutput.ColorizeHeader("NAMESPACE", w.noColor), + coloroutput.ColorizeHeader("REVISION", w.noColor), + coloroutput.ColorizeHeader("UPDATED", w.noColor), + coloroutput.ColorizeHeader("STATUS", w.noColor), + coloroutput.ColorizeHeader("CHART", w.noColor), + coloroutput.ColorizeHeader("APP VERSION", w.noColor), ) } for _, r := range w.releases { @@ -215,7 +216,7 @@ func (w *releaseListWriter) WriteTable(out io.Writer) error { default: status = release.Status(r.Status) } - table.AddRow(r.Name, output.ColorizeNamespace(r.Namespace, w.noColor), r.Revision, r.Updated, output.ColorizeStatus(status, w.noColor), r.Chart, r.AppVersion) + table.AddRow(r.Name, coloroutput.ColorizeNamespace(r.Namespace, w.noColor), r.Revision, r.Updated, coloroutput.ColorizeStatus(status, w.noColor), r.Chart, r.AppVersion) } return output.EncodeTable(out, table) } diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go index 2177df922..3198d468f 100644 --- a/pkg/cmd/status.go +++ b/pkg/cmd/status.go @@ -31,6 +31,7 @@ import ( "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" ) @@ -132,8 +133,8 @@ func (s statusPrinter) WriteTable(out io.Writer) error { if !s.release.Info.LastDeployed.IsZero() { _, _ = fmt.Fprintf(out, "LAST DEPLOYED: %s\n", s.release.Info.LastDeployed.Format(time.ANSIC)) } - _, _ = fmt.Fprintf(out, "NAMESPACE: %s\n", output.ColorizeNamespace(s.release.Namespace, s.noColor)) - _, _ = fmt.Fprintf(out, "STATUS: %s\n", output.ColorizeStatus(s.release.Info.Status, s.noColor)) + _, _ = fmt.Fprintf(out, "NAMESPACE: %s\n", coloroutput.ColorizeNamespace(s.release.Namespace, s.noColor)) + _, _ = fmt.Fprintf(out, "STATUS: %s\n", coloroutput.ColorizeStatus(s.release.Info.Status, s.noColor)) _, _ = fmt.Fprintf(out, "REVISION: %d\n", s.release.Version) if s.showMetadata { _, _ = fmt.Fprintf(out, "CHART: %s\n", s.release.Chart.Metadata.Name)