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.
helm · Feb 7, 2025 · b430659 · b430659
1 parent e3ee8b5
commit b430659
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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),