execute helm test via go tool

Author: koba1t

Makefile-tools.mk

@@ -18,15 +18,13 @@ export IS_LOCAL = false
 install-out-of-tree-tools: \
 	$(MYGOBIN)/goimports \
 	$(MYGOBIN)/golangci-lint \
-	$(MYGOBIN)/helmV3 \
 	$(MYGOBIN)/mdrip \
 	$(MYGOBIN)/stringer
 
 .PHONY: uninstall-out-of-tree-tools
 uninstall-out-of-tree-tools:
 	rm -f $(MYGOBIN)/goimports
 	rm -f $(MYGOBIN)/golangci-lint
-	rm -f $(MYGOBIN)/helmV3
 	rm -f $(MYGOBIN)/mdrip
 	rm -f $(MYGOBIN)/stringer
 
@@ -81,17 +79,3 @@ $(MYGOBIN)/gh:
 .PHONY: $(MYGOBIN)/kubeval
 $(MYGOBIN)/kubeval:
 	cd $(REPO_ROOT)/hack && go install github.com/instrumenta/kubeval
-
-# Helm V3 differs from helm V2; downloading it to provide coverage for the
-# chart inflator plugin under helm v3.
-.PHONY: $(MYGOBIN)/helmV3
-$(MYGOBIN)/helmV3:
-	( \
-		set -e; \
-		d=$(shell mktemp -d); cd $$d; \
-		tgzFile=helm-v3.10.2-$(GOOS)-$(GOARCH).tar.gz; \
-		wget https://get.helm.sh/$$tgzFile; \
-		tar -xvzf $$tgzFile; \
-		mv $(GOOS)-$(GOARCH)/helm $(MYGOBIN)/helmV3; \
-		rm -rf $$d \
-	)

api/internal/builtins/HelmChartInflationGenerator.go

@@ -5,7 +5,6 @@ package kusttest_test
 
 import (
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -87,9 +86,13 @@ func makeBaseEnhancedHarness(t *testing.T) *HarnessEnhanced {
 			filesys.MakeFsOnDisk())}
 }
 
+// ErrIfNoHelm checks if helm binary is available in PATH.
+// temporary disable to check helm binary presence
+// TODO(koba1t): remove this function when helm binary is always available via 'go tool'.
 func (th *HarnessEnhanced) ErrIfNoHelm() error {
-	_, err := exec.LookPath(th.GetPluginConfig().HelmConfig.Command)
-	return err
+	// _, err := exec.LookPath(th.GetPluginConfig().HelmConfig.Command)
+	// return err
+	return nil
 }
 
 func (th *HarnessEnhanced) GetRoot() string {

api/testutils/kusttest/harnessenhanced.go

@@ -30,7 +30,7 @@ func EnabledPluginConfig(b BuiltinPluginLoadingOptions) (pc *PluginConfig) {
 	pc = MakePluginConfig(PluginRestrictionsNone, b)
 	pc.HelmConfig.Enabled = true
 	// If this command is not on PATH, tests needing it should skip.
-	pc.HelmConfig.Command = "helmV3"
+	pc.HelmConfig.Command = "go tool helm.sh/helm/v3/cmd/helm"
 	return
 }
 

api/types/pluginconfig.go

@@ -170,7 +170,13 @@ func (p *plugin) runHelmCommand(
 	args []string) ([]byte, error) {
 	stdout := new(bytes.Buffer)
 	stderr := new(bytes.Buffer)
-	cmd := exec.Command(p.h.GeneralConfig().HelmConfig.Command, args...)
+	helmCommand := p.h.GeneralConfig().HelmConfig.Command
+	cmdParts := strings.Fields(helmCommand)
+	if len(cmdParts) == 0 {
+		return nil, fmt.Errorf("helm command is empty")
+	}
+	allArgs := append(cmdParts[1:], args...)
+	cmd := exec.Command(cmdParts[0], allArgs...)
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
 	env := []string{