Merge branch 'main' into develop

# Conflicts:
#	go.mod
#	go.sum
#	internal/app/api/v1/testsuites.go
#	test/artillery/executor-smoke/crd/crd.yaml
#	test/container-executor/executor-smoke/crd/curl.yaml
#	test/container-executor/executor-smoke/crd/cypress.yaml
#	test/container-executor/executor-smoke/crd/k6.yaml
#	test/container-executor/executor-smoke/crd/playwright.yaml
#	test/curl/executor-tests/crd/smoke.yaml
#	test/ginkgo/executor-tests/crd/smoke.yaml
#	test/gradle/executor-smoke/crd/crd.yaml
#	test/jmeter/executor-tests/crd/smoke.yaml
#	test/k6/executor-tests/crd/other.yaml
#	test/k6/executor-tests/crd/smoke.yaml
#	test/kubepug/executor-smoke/crd/crd.yaml
#	test/playwright/executor-tests/crd/crd.yaml
#	test/soapui/executor-smoke/crd/crd.yaml

api/v1/testkube.yaml

@@ -4227,7 +4227,7 @@ components:
           description: configuration parameters for storing test artifacts
         preRunScript:
           type: string
-          description: script to run before test execution
+          description: script to run before test execution (not supported for container executors)
           example: "echo -n '$SECRET_ENV' > ./secret_file"
         postRunScript:
           type: string
@@ -4762,7 +4762,7 @@ components:
           description: adjusting parameters for test content
         preRunScript:
           type: string
-          description: script to run before test execution
+          description: script to run before test execution (not supported for container executors)
           example: "echo -n '$SECRET_ENV' > ./secret_file"
         postRunScript:
           type: string
@@ -6003,4 +6003,4 @@ components:
                   - execution
               filePath:
                 type: string
-                example: folder/file.txt
+                example: folder/file.txt

cmd/kubectl-testkube/commands/tests/renderer/test_obj.go

@@ -96,6 +96,23 @@ func TestRenderer(client client.Client, ui *ui.UI, obj interface{}) error {
 		if len(test.ExecutionRequest.Args) > 0 {
 			ui.Warn("  Args:                   ", test.ExecutionRequest.Args...)
 		}
+		ui.Warn("  Args mode:              ", test.ExecutionRequest.ArgsMode)
+
+		if test.ExecutionRequest.ArgsMode != "" {
+			ui.Warn("  Args mode:              ", test.ExecutionRequest.ArgsMode)
+		}
+
+		if test.ExecutionRequest.ArgsMode != "" {
+			ui.Warn("  Args mode:              ", test.ExecutionRequest.ArgsMode)
+		}
+
+		if test.ExecutionRequest.ArgsMode != "" {
+			ui.Warn("  Args mode:              ", test.ExecutionRequest.ArgsMode)
+		}
+
+		if test.ExecutionRequest.ArgsMode != "" {
+			ui.Warn("  Args mode:              ", test.ExecutionRequest.ArgsMode)
+		}
 
 		if test.ExecutionRequest.ArgsMode != "" {
 			ui.Warn("  Args mode:              ", test.ExecutionRequest.ArgsMode)

go.mod

@@ -104,7 +104,7 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.21 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.13.0 // indirect
+	github.com/muesli/termenv v0.14.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nats-io/jwt/v2 v2.3.0 // indirect
 	github.com/nats-io/nats-server/v2 v2.8.4 // indirect

go.sum

@@ -296,8 +296,8 @@ github.com/moogar0880/problems v0.1.1/go.mod h1:5Dxrk2sD7BfBAgnOzQ1yaTiuCYdGPUh4
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.11.0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
-github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0=
-github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
+github.com/muesli/termenv v0.14.0 h1:8x9NFfOe8lmIWK4pgy3IfVEy47f+ppe3tUqdPZG2Uy0=
+github.com/muesli/termenv v0.14.0/go.mod h1:kG/pF1E7fh949Xhe156crRUrHNyK221IuGO7Ez60Uc8=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=

install.sh

@@ -1,22 +1,22 @@
 #!/bin/bash 
 echo "Getting kubectl-testkube plugin"
 
-if [ ! -z "${DEBUG}" ]; 
-then set -x 
-fi 
+if [ ! -z "${DEBUG}" ];
+then set -x
+fi
 
-_detect_arch() { 
-    case $(uname -m) in 
-    amd64|x86_64) echo "x86_64" 
-    ;; 
-    arm64|aarch64) echo "arm64" 
-    ;; 
-    i386) echo "i386" 
-    ;; 
-    *) echo "Unsupported processor architecture"; 
-    return 1 
+_detect_arch() {
+    case $(uname -m) in
+    amd64|x86_64) echo "x86_64"
+    ;;
+    arm64|aarch64) echo "arm64"
+    ;;
+    i386) echo "i386"
+    ;;
+    *) echo "Unsupported processor architecture";
+    return 1
     ;;
-     esac 
+     esac
 }
 
 _detect_os(){

internal/app/api/v1/testsuites.go

@@ -9,6 +9,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -26,6 +27,7 @@ import (
 	"github.com/kubeshop/testkube/pkg/repository/testresult"
 	"github.com/kubeshop/testkube/pkg/scheduler"
 	"github.com/kubeshop/testkube/pkg/types"
+	"github.com/kubeshop/testkube/pkg/utils"
 	"github.com/kubeshop/testkube/pkg/workerpool"
 )
 
@@ -665,24 +667,31 @@ func (s TestkubeAPI) ExecuteTestSuitesHandler() fiber.Handler {
 
 func (s TestkubeAPI) ListTestSuiteExecutionsHandler() fiber.Handler {
 	return func(c *fiber.Ctx) error {
+
+		now := time.Now()
+		var l = s.Log.With("handler", "ListTestSuiteExecutionsHandler", "id", utils.RandAlphanum(10))
+
 		errPrefix := "failed to list test suite execution"
 		filter := getExecutionsFilterFromRequest(c)
 
 		ctx := c.Context()
 		executionsTotals, err := s.TestExecutionResults.GetExecutionsTotals(ctx, filter)
 		if err != nil {
-			return s.Error(c, http.StatusInternalServerError, fmt.Errorf("%s: client could not get total executions: %w", errPrefix, err))
+			return s.Error(c, http.StatusInternalServerError, fmt.Errorf("%s: client could not get executions totals: %w", errPrefix, err))
 		}
+		l.Debugw("got executions totals", "totals", executionsTotals, "time", time.Since(now)		
 		nameFilter := testresult.NewExecutionsFilter().WithName(c.Query("id", ""))
 		allExecutionsTotals, err := s.TestExecutionResults.GetExecutionsTotals(ctx, nameFilter)
 		if err != nil {
-			return s.Error(c, http.StatusInternalServerError, fmt.Errorf("%s: client could not get all total executions: %w", errPrefix, err))
+			return s.Error(c, http.StatusInternalServerError, fmt.Errorf("%s: client could not get all executions totals: %w", errPrefix, err))
 		}
+		l.Debugw("got all executions totals", "totals", executionsTotals, "time", time.Since(now))
 
 		executions, err := s.TestExecutionResults.GetExecutions(ctx, filter)
 		if err != nil {
 			return s.Error(c, http.StatusInternalServerError, fmt.Errorf("%s: client could not get executions: %w", errPrefix, err))
 		}
+		l.Debugw("got executions", "time", time.Since(now))
 
 		return c.JSON(testkube.TestSuiteExecutionsResult{
 			Totals:   &allExecutionsTotals,

pkg/api/v1/testkube/model_test_base.go

@@ -36,4 +36,6 @@ type Test struct {
 	Uploads          []string          `json:"uploads,omitempty"`
 	ExecutionRequest *ExecutionRequest `json:"executionRequest,omitempty"`
 	Status           *TestStatus       `json:"status,omitempty"`
+	// true means that test is offline and cannot be executed
+	ReadOnly bool `json:"readOnly,omitempty"`
 }

pkg/executor/agent/agent.go

@@ -72,7 +72,11 @@ func Run(ctx context.Context, r runner.Runner, args []string) {
 		}
 	}
 
-	output.PrintEvent("running test", e.Id)
+	// get event only when it's test run in main container
+	if r.GetType().IsMain() {
+		output.PrintEvent("running test", e.Id)
+	}
+
 	result, err := r.Run(ctx, e)
 
 	if r.GetType().IsMain() && e.PostRunScript != "" && !e.ExecutePostRunScriptBeforeScraping {
@@ -89,6 +93,10 @@ func Run(ctx context.Context, r runner.Runner, args []string) {
 		os.Exit(1)
 	}
 
+	if r.GetType().IsMain() {
+		output.PrintEvent("test execution finished", e.Id)
+	}
+
 	output.PrintResult(result)
 }
 

test/artillery/executor-smoke/crd/crd.yaml

@@ -35,4 +35,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 256Mi\n              cpu: 128m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/container-executor/executor-smoke/crd/curl.yaml

@@ -35,4 +35,4 @@ spec:
         value: https://testkube.non.existing.url.example
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 32Mi\n              cpu: 32m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/container-executor/executor-smoke/crd/cypress.yaml

@@ -66,4 +66,4 @@ spec:
       dirs:
         - ./
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 2Gi\n              cpu: 2\n"
-    activeDeadlineSeconds: 600
+    activeDeadlineSeconds: 600

test/container-executor/executor-smoke/crd/k6.yaml

@@ -38,4 +38,4 @@ spec:
   executionRequest:
     args: ["run", "k6-smoke-test-without-envs.js"]
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 64Mi\n              cpu: 128m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/container-executor/executor-smoke/crd/playwright.yaml

@@ -21,4 +21,4 @@ spec:
       dirs:
         - ./
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 2Gi\n              cpu: 2\n"
-    activeDeadlineSeconds: 600
+    activeDeadlineSeconds: 600

test/curl/executor-tests/crd/smoke.yaml

@@ -56,4 +56,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 32Mi\n              cpu: 32m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/ginkgo/executor-tests/crd/smoke.yaml

@@ -36,4 +36,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 512Mi\n              cpu: 512m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/gradle/executor-smoke/crd/crd.yaml

@@ -114,4 +114,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 512Mi\n              cpu: 512m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/jmeter/executor-tests/crd/smoke.yaml

@@ -82,4 +82,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 512Mi\n              cpu: 512m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/k6/executor-tests/crd/other.yaml

@@ -25,4 +25,4 @@ spec:
       - K6_ENV_FROM_PARAM=K6_ENV_FROM_PARAM_value
       - k6-smoke-test.js
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 128Mi\n              cpu: 128m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/k6/executor-tests/crd/smoke.yaml

@@ -70,4 +70,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 128Mi\n              cpu: 128m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/kubepug/executor-smoke/crd/crd.yaml

@@ -35,4 +35,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 64Mi\n              cpu: 128m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180

test/playwright/executor-tests/crd/crd.yaml

@@ -15,4 +15,4 @@ spec:
       path: test/playwright/executor-tests/playwright-project
   executionRequest:
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 2Gi\n              cpu: 2\n"
-    activeDeadlineSeconds: 600
+    activeDeadlineSeconds: 600

test/scripts/executor-tests/run.sh

@@ -103,7 +103,7 @@ common_run() { # name, test_crd_file, testsuite_name, testsuite_file, custom_exe
     kubectl --namespace $namespace apply -f $test_crd_file
 
     # TestsSuites
-    create_update_testsuite "$testsuite_name" "$testsuite_file"
+    create_update_testsuite "$testsuite_file"
   fi
 
   if [ "$run" = true ] && [ "$custom_testsuite" = '' ]; then
@@ -336,7 +336,7 @@ main() {
     filename=$(basename $custom_testsuite)
     testsuite_name="${filename%%.*}"
 
-    create_update_testsuite "$testsuite_name" "$custom_testsuite"
+    create_update_testsuite "$custom_testsuite"
     run_follow_testsuite "$testsuite_name"
   fi
 }

test/soapui/executor-smoke/crd/crd.yaml

@@ -35,4 +35,4 @@ spec:
   executionRequest:
     negativeTest: true
     jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n  template:\n    spec:\n      containers:\n        - name: \"{{ .Name }}\"\n          image: {{ .Image }}\n          resources:\n            requests:\n              memory: 256Mi\n              cpu: 512m\n"
-    activeDeadlineSeconds: 180
+    activeDeadlineSeconds: 180