fix: small fixes (#5059)

kubeshop · Feb 23, 2024 · 1d07d3a · 1d07d3a
1 parent 442d5d4
commit 1d07d3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/crd/templates/testsuite.tmpl b/pkg/crd/templates/testsuite.tmpl
@@ -83,7 +83,7 @@ spec:
  {{- if ne (len .ExecutionRequest.Args) 0 }}
  args:
  {{- range .ExecutionRequest.Args }}
- - {{ . | quote }}
+ - "{{ . }}"
  {{- end }}
  {{- end }}
  {{- if .ExecutionRequest.ArgsMode }}
@@ -214,7 +214,7 @@ spec:
  {{- if ne (len .ExecutionRequest.Args) 0 }}
  args:
  {{- range .ExecutionRequest.Args }}
- - {{ . | quote }}
+ - "{{ . }}"
  {{- end }}
  {{- end }}
  {{- if .ExecutionRequest.ArgsMode }}
@@ -345,7 +345,7 @@ spec:
  {{- if ne (len .ExecutionRequest.Args) 0 }}
  args:
  {{- range .ExecutionRequest.Args }}
- - {{ . | quote }}
+ - "{{ . }}"
  {{- end }}
  {{- end }}
  {{- if .ExecutionRequest.ArgsMode }}

diff --git a/pkg/tcl/testsuitestcl/steps.go b/pkg/tcl/testsuitestcl/steps.go
@@ -18,6 +18,9 @@ import (
 
 // MergeStepRequest inherits step request fields with execution request
 func MergeStepRequest(stepRequest *testkube.TestSuiteStepExecutionRequest, executionRequest testkube.ExecutionRequest) testkube.ExecutionRequest {
+ if stepRequest == nil {
+ return executionRequest
+ }
  if stepRequest.ExecutionLabels != nil {
  executionRequest.ExecutionLabels = stepRequest.ExecutionLabels
  }