From c57e9113ffed046fe837ffa44d41000386966711 Mon Sep 17 00:00:00 2001 From: Dylan Arbour Date: Fri, 7 Feb 2025 18:01:26 -0500 Subject: [PATCH] Fix `helm-extra-set-args` in YAML configuration Currently, `helm-extra-set-args` is only available as a command-line flag, despite being part of the config object. This does not appear to be documented. This changes sources the value `extraSetArgs` via the `config` object rather than the cmd.Flags() only. Signed-off-by: Dylan Arbour --- ct/cmd/install.go | 6 +----- ct/cmd/lint.go | 3 +-- ct/cmd/lintAndInstall.go | 6 +----- ct/cmd/listChanged.go | 3 +-- pkg/chart/chart.go | 5 +++-- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ct/cmd/install.go b/ct/cmd/install.go index 734ea079..dc07caa8 100644 --- a/ct/cmd/install.go +++ b/ct/cmd/install.go @@ -93,11 +93,7 @@ func install(cmd *cobra.Command, _ []string) error { return fmt.Errorf("failed loading configuration: %w", err) } - extraSetArgs, err := cmd.Flags().GetString("helm-extra-set-args") - if err != nil { - return err - } - testing, err := chart.NewTesting(*configuration, extraSetArgs) + testing, err := chart.NewTesting(*configuration) if err != nil { fmt.Println(err) } diff --git a/ct/cmd/lint.go b/ct/cmd/lint.go index 5c9b421d..73e6a834 100644 --- a/ct/cmd/lint.go +++ b/ct/cmd/lint.go @@ -90,8 +90,7 @@ func lint(cmd *cobra.Command, _ []string) error { return fmt.Errorf("failed loading configuration: %w", err) } - emptyExtraSetArgs := "" - testing, err := chart.NewTesting(*configuration, emptyExtraSetArgs) + testing, err := chart.NewTesting(*configuration) if err != nil { return err } diff --git a/ct/cmd/lintAndInstall.go b/ct/cmd/lintAndInstall.go index d885033c..760a883d 100644 --- a/ct/cmd/lintAndInstall.go +++ b/ct/cmd/lintAndInstall.go @@ -51,11 +51,7 @@ func lintAndInstall(cmd *cobra.Command, _ []string) error { return fmt.Errorf("failed loading configuration: %w", err) } - extraSetArgs, err := cmd.Flags().GetString("helm-extra-set-args") - if err != nil { - return err - } - testing, err := chart.NewTesting(*configuration, extraSetArgs) + testing, err := chart.NewTesting(*configuration) if err != nil { return err } diff --git a/ct/cmd/listChanged.go b/ct/cmd/listChanged.go index 177e9df5..0aafc6eb 100644 --- a/ct/cmd/listChanged.go +++ b/ct/cmd/listChanged.go @@ -50,8 +50,7 @@ func listChanged(cmd *cobra.Command, _ []string) error { return fmt.Errorf("failed loading configuration: %w", err) } - emptyExtraSetArgs := "" - testing, err := chart.NewTesting(*configuration, emptyExtraSetArgs) + testing, err := chart.NewTesting(*configuration) if err != nil { return err } diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go index 227ecc71..703fc4ef 100644 --- a/pkg/chart/chart.go +++ b/pkg/chart/chart.go @@ -260,14 +260,15 @@ type TestResult struct { } // NewTesting creates a new Testing struct with the given config. -func NewTesting(config config.Configuration, extraSetArgs string) (Testing, error) { +func NewTesting(config config.Configuration) (Testing, error) { procExec := exec.NewProcessExecutor(config.Debug) helmExtraArgs := strings.Fields(config.HelmExtraArgs) + helmExtraSetArgs := strings.Fields(config.HelmExtraSetArgs) helmLintExtraArgs := strings.Fields(config.HelmLintExtraArgs) testing := Testing{ config: config, - helm: tool.NewHelm(procExec, helmExtraArgs, helmLintExtraArgs, strings.Fields(extraSetArgs)), + helm: tool.NewHelm(procExec, helmExtraArgs, helmLintExtraArgs, helmExtraSetArgs), git: tool.NewGit(procExec), kubectl: tool.NewKubectl(procExec, config.KubectlTimeout), linter: tool.NewLinter(procExec),