Merge branch 'develop' into vsukhin/feature/execution-tags

Signed-off-by: Vladislav Sukhin <[email protected]>

# Conflicts:
#	docs/docs/cli/testkube_get_testworkflowexecution.md
#	docs/docs/cli/testkube_run_testworkflow.md
#	go.mod
#	go.sum
#	pkg/api/v1/testkube/model_test_workflow_independent_step_parallel.go
#	pkg/api/v1/testkube/model_test_workflow_step_parallel.go

.github/workflows/codeql-analysis.yml

@@ -52,7 +52,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.25.15
+      uses: github/codeql-action/init@v3.26.0
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -82,4 +82,4 @@ jobs:
           test-${{ runner.os }}-go-
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.25.15
+      uses: github/codeql-action/analyze@v3.26.0

.github/workflows/docker-build-api-executors-tag.yaml

@@ -128,7 +128,7 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: release -f goreleaser_files/.goreleaser-docker-build-testworkflow.yml
+          args: release -f goreleaser_files/.goreleaser-docker-build-${{ matrix.service }}.yml
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
           ANALYTICS_TRACKING_ID: ${{secrets.TESTKUBE_API_GA_MEASUREMENT_ID}}

.github/workflows/docker-build-develop.yaml

@@ -114,7 +114,7 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: release -f goreleaser_files/.goreleaser-docker-build-testworkflow.yml --snapshot
+          args: release -f goreleaser_files/.goreleaser-docker-build-${{ matrix.service }}.yml --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
           ANALYTICS_TRACKING_ID: ${{secrets.TESTKUBE_API_GA_MEASUREMENT_ID}}

.github/workflows/docker-build-release.yaml

@@ -115,7 +115,7 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: release -f goreleaser_files/.goreleaser-docker-build-testworkflow.yml --snapshot
+          args: release -f goreleaser_files/.goreleaser-docker-build-${{ matrix.service }}.yml --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
           ANALYTICS_TRACKING_ID: ${{secrets.TESTKUBE_API_GA_MEASUREMENT_ID}}

.github/workflows/sandbox.yaml

@@ -137,7 +137,7 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: release -f goreleaser_files/.goreleaser-docker-build-testworkflow.yml --snapshot
+          args: release -f goreleaser_files/.goreleaser-docker-build-${{ matrix.service }}.yml --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
           ANALYTICS_TRACKING_ID: ${{secrets.TESTKUBE_API_GA_MEASUREMENT_ID}}

.github/workflows/scorecard.yml

@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@16639b4b1a370bc8a577d4d659aa0357b46cc5b2 # v2.25.3
+        uses: github/codeql-action/upload-sarif@5c02493ebfd65b28fd3b082c65e5af2cd745d91f # v2.25.3
         with:
           sarif_file: results.sarif

api/v1/testkube.yaml

@@ -8486,6 +8486,14 @@ components:
       required:
       - from
 
+    TestWorkflowSystem:
+      type: object
+      properties:
+        pureByDefault:
+          $ref: "#/components/schemas/BoxedBoolean"
+        isolatedContainers:
+          $ref: "#/components/schemas/BoxedBoolean"
+
     TestWorkflowSpec:
       type: object
       properties:
@@ -8495,6 +8503,8 @@ components:
             $ref: "#/components/schemas/TestWorkflowTemplateRef"
         config:
           $ref: "#/components/schemas/TestWorkflowConfigSchema"
+        system:
+          $ref: "#/components/schemas/TestWorkflowSystem"
         content:
           $ref: "#/components/schemas/TestWorkflowContent"
         services:
@@ -8531,6 +8541,8 @@ components:
       properties:
         config:
           $ref: "#/components/schemas/TestWorkflowConfigSchema"
+        system:
+          $ref: "#/components/schemas/TestWorkflowSystem"
         content:
           $ref: "#/components/schemas/TestWorkflowContent"
         services:
@@ -8607,6 +8619,8 @@ components:
         condition:
           type: string
           description: expression to declare under which conditions the step should be run; defaults to "passed", except artifacts where it defaults to "always"
+        pure:
+          $ref: "#/components/schemas/BoxedBoolean"
         paused:
           type: boolean
           description: should the step be paused initially
@@ -8667,6 +8681,8 @@ components:
         condition:
           type: string
           description: expression to declare under which conditions the step should be run; defaults to "passed", except artifacts where it defaults to "always"
+        pure:
+          $ref: "#/components/schemas/BoxedBoolean"
         paused:
           type: boolean
           description: should the step be paused initially

build/testworkflow-init/Dockerfile

@@ -1,6 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG BUSYBOX_IMAGE
 FROM ${BUSYBOX_IMAGE}
+RUN cp -rf /bin /.tktw-bin
 COPY testworkflow-init /init
 USER 1001
 ENTRYPOINT ["/init"]

build/testworkflow-toolkit/Dockerfile

@@ -1,8 +1,13 @@
 # syntax=docker/dockerfile:1
+ARG BUSYBOX_IMAGE
 ARG ALPINE_IMAGE
+
+FROM ${BUSYBOX_IMAGE} AS busybox
 FROM ${ALPINE_IMAGE}
 RUN apk --no-cache add ca-certificates libssl3 git openssh-client
+COPY --from=busybox /bin /.tktw-bin
 COPY testworkflow-toolkit /toolkit
+COPY testworkflow-init /init
 RUN adduser --disabled-password --home / --no-create-home --uid 1001 default
 USER 1001
 ENTRYPOINT ["/toolkit"]

cmd/api-server/main.go

@@ -102,8 +102,6 @@ import (
 	"github.com/kubeshop/testkube/pkg/testworkflows/testworkflowexecutor"
 )
 
-var verbose = flag.Bool("v", false, "enable verbosity level")
-
 func init() {
 	flag.Parse()
 }
@@ -208,7 +206,7 @@ func main() {
 			cfg.TestkubeProURL,
 			cfg.TestkubeProCertFile,
 			cfg.TestkubeProKeyFile,
-			cfg.TestkubeProCAFile,
+			cfg.TestkubeProCAFile, //nolint
 			log.DefaultLogger,
 		)
 		exitOnError("error creating gRPC connection", err)

cmd/kubectl-testkube/commands/common/validator/version.go

@@ -8,13 +8,24 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kubeshop/testkube/cmd/kubectl-testkube/commands/common"
+	"github.com/kubeshop/testkube/cmd/kubectl-testkube/commands/common/render"
 	"github.com/kubeshop/testkube/pkg/ui"
 )
 
 var ErrOldClientVersion = fmt.Errorf("client version is older than api version, please upgrade")
 
 // PersistentPreRunVersionCheck will check versions based on commands client
 func PersistentPreRunVersionCheck(cmd *cobra.Command, clientVersion string) {
+	outputFlag := cmd.Flag("output")
+	outputType := render.OutputPretty
+	if outputFlag != nil {
+		outputType = render.OutputType(outputFlag.Value.String())
+	}
+
+	if outputType != render.OutputPretty {
+		return
+	}
+
 	// version validation
 	// if client version is less than server version show warning
 	client, _, err := common.GetClient(cmd)

cmd/tcl/testworkflow-toolkit/commands/services.go

@@ -179,7 +179,7 @@ func NewServicesCmd() *cobra.Command {
 						v, err := expressions.EvalTemplate(svcSpec.Timeout, machines...)
 						ui.ExitOnError(fmt.Sprintf("%s: %d: error: timeout expression", commontcl.ServiceLabel(name), index), err)
 						d, err := time.ParseDuration(strings.ReplaceAll(v, " ", ""))
-						ui.ExitOnError(fmt.Sprintf("%s: %d: error: invalid timeout: %s:", commontcl.ServiceLabel(name), index, v), err)
+						ui.ExitOnError(fmt.Sprintf("%s: %d: error: invalid timeout: %s", commontcl.ServiceLabel(name), index, v), err)
 						svcInstances[index].Timeout = &d
 					}
 				}

cmd/tcl/testworkflow-toolkit/spawn/utils.go

@@ -170,11 +170,12 @@ func ProcessFetch(transferSrv transfer.Server, fetch []testworkflowsv1.StepParal
 				ContainerConfig: testworkflowsv1.ContainerConfig{
 					Image:           env.Config().Images.Toolkit,
 					ImagePullPolicy: corev1.PullIfNotPresent,
-					Command:         common.Ptr([]string{"/toolkit", "transfer"}),
+					Command:         common.Ptr([]string{constants.DefaultToolkitPath, "transfer"}),
 					Env: []corev1.EnvVar{
 						{Name: "TK_NS", Value: env.Namespace()},
 						{Name: "TK_REF", Value: env.Ref()},
 						stage.BypassToolkitCheck,
+						stage.BypassPure,
 					},
 					Args: &result,
 				},

cmd/testworkflow-init/commands/setup.go

@@ -30,12 +30,26 @@ func Setup(config lite.ActionSetup) error {
 		stdoutUnsafe.Print(" skipped\n")
 	}
 
+	// Copy the toolkit
+	stdoutUnsafe.Print("Configuring toolkit...")
+	if config.CopyToolkit {
+		err := exec.Command("cp", "/toolkit", data.ToolkitPath).Run()
+		if err != nil {
+			stdoutUnsafe.Error(" error\n")
+			stdoutUnsafe.Errorf("  failed to copy the /toolkit utilities: %s\n", err.Error())
+			return err
+		}
+		stdoutUnsafe.Print(" done\n")
+	} else {
+		stdoutUnsafe.Print(" skipped\n")
+	}
+
 	// Copy the shell and useful libraries
 	stdoutUnsafe.Print("Configuring shell...")
 	if config.CopyBinaries {
 		// Use `cp` on the whole directory, as it has plenty of files, which lead to the same FS block.
 		// Copying individual files will lead to high FS usage
-		err := exec.Command("cp", "-rf", "/bin", data.InternalBinPath).Run()
+		err := exec.Command("cp", "-rf", "/.tktw-bin", data.InternalBinPath).Run()
 		if err != nil {
 			stdoutUnsafe.Error(" error\n")
 			stdoutUnsafe.Errorf("  failed to copy the binaries: %s\n", err.Error())

cmd/testworkflow-init/data/constants.go

@@ -11,6 +11,7 @@ const (
 var (
 	InternalBinPath = filepath.Join(InternalPath, "bin")
 	InitPath        = filepath.Join(InternalPath, "init")
+	ToolkitPath     = filepath.Join(InternalPath, "toolkit")
 	StatePath       = filepath.Join(InternalPath, "state")
 )
 

cmd/testworkflow-init/orchestration/executions.go

@@ -177,6 +177,7 @@ func (e *execution) Run() (*executionResult, error) {
 		e.group.pauseMu.Unlock()
 		e.cmdMu.Unlock()
 		_, exitCode = getProcessStatus(err)
+		e.cmd.Stderr.Write(append([]byte(err.Error()), '\n'))
 	}
 
 	// Clean up

cmd/testworkflow-init/orchestration/setup.go

@@ -220,7 +220,7 @@ func (c *setup) SetWorkingDir(workingDir string) {
 		wd = workingDir
 		_ = os.MkdirAll(wd, 0755)
 	} else {
-		err = os.MkdirAll(wd, 0755)
+		_ = os.MkdirAll(wd, 0755)
 	}
 	err = os.Chdir(wd)
 

cmd/testworkflow-toolkit/artifacts/cloud_uploader.go

@@ -41,6 +41,7 @@ type cloudUploader struct {
 	parallelism  int
 	error        atomic.Bool
 	reqEnhancers []CloudUploaderRequestEnhancer
+	waitMu       sync.Mutex
 }
 
 func (d *cloudUploader) Start() (err error) {
@@ -140,6 +141,8 @@ func (d *cloudUploader) Add(path string, file io.Reader, size int64) error {
 }
 
 func (d *cloudUploader) End() error {
+	d.waitMu.Lock()
+	defer d.waitMu.Unlock()
 	d.wg.Wait()
 	if d.error.Load() {
 		return fmt.Errorf("upload failed")