fix: expand env for args (#4481)

kubeshop · Oct 20, 2023 · 1df18ae · 1df18ae
1 parent a31083f
commit 1df18ae
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 0 deletions.
diff --git a/contrib/executor/artillery/pkg/runner/artillery.go b/contrib/executor/artillery/pkg/runner/artillery.go
@@ -100,6 +100,8 @@ func (r *ArtilleryRunner) Run(ctx context.Context, execution testkube.Execution)
 		if args[i] == "<runPath>" {
 			args[i] = path
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 
 	runPath := testDir

diff --git a/contrib/executor/curl/pkg/runner/runner.go b/contrib/executor/curl/pkg/runner/runner.go
@@ -135,6 +135,9 @@ func (r *CurlRunner) Run(ctx context.Context, execution testkube.Execution) (res
 	}
 
 	args = append(args, execution.Args...)
+	for i := range args {
+		args[i] = os.ExpandEnv(args[i])
+	}
 
 	runPath := workingDir
 	outputPkg.PrintLogf("%s Test run command %s %s", ui.IconRocket, command, strings.Join(args, " "))

diff --git a/contrib/executor/cypress/pkg/runner/cypress.go b/contrib/executor/cypress/pkg/runner/cypress.go
@@ -137,6 +137,8 @@ func (r *CypressRunner) Run(ctx context.Context, execution testkube.Execution) (
 		if args[i] == "<envVars>" {
 			args[i] = strings.Join(envVars, ",")
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 
 	// run cypress inside repo directory ignore execution error in case of failed test

diff --git a/contrib/executor/ginkgo/pkg/runner/runner.go b/contrib/executor/ginkgo/pkg/runner/runner.go
@@ -296,6 +296,8 @@ func BuildGinkgoArgs(params map[string]string, path, runPath, reportFile string,
 		if args[i] == "<reportFile>" {
 			args[i] = reportFile
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 
 	output.PrintLogf("%s Ginkgo arguments from params built: %s", ui.IconCheckMark, args)

diff --git a/contrib/executor/gradle/pkg/runner/runner.go b/contrib/executor/gradle/pkg/runner/runner.go
@@ -131,6 +131,7 @@ func (r *GradleRunner) Run(ctx context.Context, execution testkube.Execution) (r
 		if args[i] == "<projectDir>" {
 			args[i] = project
 		}
+
 		args[i] = os.ExpandEnv(args[i])
 	}
 

diff --git a/contrib/executor/jmeter/pkg/runner/runner.go b/contrib/executor/jmeter/pkg/runner/runner.go
@@ -151,6 +151,10 @@ func (r *JMeterRunner) Run(ctx context.Context, execution testkube.Execution) (r
 		}
 	}
 
+	for i := range args {
+		args[i] = os.ExpandEnv(args[i])
+	}
+
 	output.PrintLogf("%s Using arguments: %v", ui.IconWorld, args)
 
 	entryPoint := getEntryPoint()

diff --git a/contrib/executor/jmeterd/pkg/runner/runner.go b/contrib/executor/jmeterd/pkg/runner/runner.go
@@ -191,6 +191,10 @@ func (r *JMeterDRunner) Run(ctx context.Context, execution testkube.Execution) (
 		}
 	}
 
+	for i := range args {
+		args[i] = os.ExpandEnv(args[i])
+	}
+
 	output.PrintLogf("%s Using arguments: %v", ui.IconWorld, args)
 
 	entryPoint := getEntryPoint()

diff --git a/contrib/executor/k6/pkg/runner/runner.go b/contrib/executor/k6/pkg/runner/runner.go
@@ -165,6 +165,10 @@ func (r *K6Runner) Run(ctx context.Context, execution testkube.Execution) (resul
 		}
 	}
 
+	for i := range args {
+		args[i] = os.ExpandEnv(args[i])
+	}
+
 	command, args := executor.MergeCommandAndArgs(execution.Command, args)
 	outputPkg.PrintEvent("Running", directory, command, args)
 	runPath := directory

diff --git a/contrib/executor/kubepug/pkg/runner/runner.go b/contrib/executor/kubepug/pkg/runner/runner.go
@@ -191,6 +191,8 @@ func buildArgs(args []string, inputPath string) ([]string, error) {
 		if args[i] == "<runPath>" {
 			args[i] = inputPath
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 	return args, nil
 }

diff --git a/contrib/executor/maven/pkg/runner/runner.go b/contrib/executor/maven/pkg/runner/runner.go
@@ -159,6 +159,8 @@ func (r *MavenRunner) Run(ctx context.Context, execution testkube.Execution) (re
 		if args[i] == "<mavenHome>" {
 			args[i] = mavenHome
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 
 	outputPkg.PrintEvent("Running goal: "+goal, mavenHome, mavenCommand, args)

diff --git a/contrib/executor/playwright/pkg/runner/playwright.go b/contrib/executor/playwright/pkg/runner/playwright.go
@@ -97,6 +97,8 @@ func (r *PlaywrightRunner) Run(ctx context.Context, execution testkube.Execution
 		if args[i] == "<depCommand>" {
 			args[i] = depCommand
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 
 	envManager := env.NewManagerWithVars(execution.Variables)

diff --git a/contrib/executor/postman/pkg/runner/newman/newman.go b/contrib/executor/postman/pkg/runner/newman/newman.go
@@ -124,6 +124,8 @@ func (r *NewmanRunner) Run(ctx context.Context, execution testkube.Execution) (r
 		if args[i] == "<runPath>" {
 			args[i] = path
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 
 	runPath := ""

diff --git a/contrib/executor/soapui/pkg/runner/runner.go b/contrib/executor/soapui/pkg/runner/runner.go
@@ -127,6 +127,8 @@ func setUpEnvironment(args []string, testFilePath string) {
 		if args[i] == "<runPath>" {
 			args[i] = testFilePath
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 	os.Setenv("COMMAND_LINE", strings.Join(args, " "))
 }

diff --git a/contrib/executor/tracetest/pkg/runner/runner.go b/contrib/executor/tracetest/pkg/runner/runner.go
@@ -3,6 +3,7 @@ package runner
 import (
 	"context"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/kubeshop/testkube/contrib/executor/tracetest/pkg/model"
@@ -151,6 +152,8 @@ func buildArgs(args []string, tracetestEndpoint string, inputPath string) ([]str
 		if args[i] == "<filePath>" {
 			args[i] = inputPath
 		}
+
+		args[i] = os.ExpandEnv(args[i])
 	}
 	return args, nil
 }
diff --git a/contrib/executor/zap/pkg/runner/runner.go b/contrib/executor/zap/pkg/runner/runner.go
@@ -255,5 +255,10 @@ func MergeArgs(fileArgs []string, reportFile string, execution testkube.Executio
 			break
 		}
 	}
+
+	for i := range args {
+		args[i] = os.ExpandEnv(args[i])
+	}
+
 	return args
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		if args[i] == "<projectDir>" {
     			args[i] = project
     		}
     		args[i] = os.ExpandEnv(args[i])
     	}
@@ Expand Down @@