fix: add source scripts field (#215)

* fix: add source scripts field * fix: adjust script source description
kubeshop · Mar 4, 2024 · b7aaa27 · b7aaa27
1 parent 4909488
commit b7aaa27
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/api/testexecution/v1/testexecution_types.go b/api/testexecution/v1/testexecution_types.go
@@ -128,6 +128,8 @@ type ExecutionRequest struct {
 	PostRunScript string `json:"postRunScript,omitempty"`
 	// execute post run script before scraping (prebuilt executor only)
 	ExecutePostRunScriptBeforeScraping bool `json:"executePostRunScriptBeforeScraping,omitempty"`
+	// run scripts using source command (container executor only)
+	SourceScripts bool `json:"sourceScripts,omitempty"`
 	// scraper template extensions
 	ScraperTemplate string `json:"scraperTemplate,omitempty"`
 	// config map references
@@ -259,8 +261,10 @@ type Execution struct {
 	// script to run after test execution
 	PostRunScript string `json:"postRunScript,omitempty"`
 	// execute post run script before scraping (prebuilt executor only)
-	ExecutePostRunScriptBeforeScraping bool            `json:"executePostRunScriptBeforeScraping,omitempty"`
-	RunningContext                     *RunningContext `json:"runningContext,omitempty"`
+	ExecutePostRunScriptBeforeScraping bool `json:"executePostRunScriptBeforeScraping,omitempty"`
+	// run scripts using source command (container executor only)
+	SourceScripts  bool            `json:"sourceScripts,omitempty"`
+	RunningContext *RunningContext `json:"runningContext,omitempty"`
 	// shell used in container executor
 	ContainerShell  string      `json:"containerShell,omitempty"`
 	SlavePodRequest *PodRequest `json:"slavePodRequest,omitempty"`

diff --git a/api/tests/v3/test_types.go b/api/tests/v3/test_types.go
@@ -224,6 +224,8 @@ type ExecutionRequest struct {
 	PostRunScript string `json:"postRunScript,omitempty"`
 	// execute post run script before scraping (prebuilt executor only)
 	ExecutePostRunScriptBeforeScraping bool `json:"executePostRunScriptBeforeScraping,omitempty"`
+	// run scripts using source command (container executor only)
+	SourceScripts bool `json:"sourceScripts,omitempty"`
 	// scraper template extensions
 	ScraperTemplate string `json:"scraperTemplate,omitempty"`
 	// name of the template resource

diff --git a/api/testsuiteexecution/v1/testsuiteexecution_types.go b/api/testsuiteexecution/v1/testsuiteexecution_types.go
@@ -275,8 +275,10 @@ type Execution struct {
 	// script to run after test execution
 	PostRunScript string `json:"postRunScript,omitempty"`
 	// execute post run script before scraping (prebuilt executor only)
-	ExecutePostRunScriptBeforeScraping bool            `json:"executePostRunScriptBeforeScraping,omitempty"`
-	RunningContext                     *RunningContext `json:"runningContext,omitempty"`
+	ExecutePostRunScriptBeforeScraping bool `json:"executePostRunScriptBeforeScraping,omitempty"`
+	// run scripts using source command (container executor only)
+	SourceScripts  bool            `json:"sourceScripts,omitempty"`
+	RunningContext *RunningContext `json:"runningContext,omitempty"`
 	// shell used in container executor
 	ContainerShell string `json:"containerShell,omitempty"`
 	// test execution name started the test execution

diff --git a/config/crd/bases/tests.testkube.io_testexecutions.yaml b/config/crd/bases/tests.testkube.io_testexecutions.yaml
@@ -282,6 +282,9 @@ spec:
                             type: object
                         type: object
                     type: object
+                  sourceScripts:
+                    description: run scripts using source command (container executor only)
+                    type: boolean
                   sync:
                     description: whether to start execution sync or async
                     type: boolean
@@ -724,6 +727,9 @@ spec:
                             type: object
                         type: object
                     type: object
+                  sourceScripts:
+                    description: run scripts using source command (container executor only)
+                    type: boolean
                   startTime:
                     description: test start time
                     format: date-time

diff --git a/config/crd/bases/tests.testkube.io_tests.yaml b/config/crd/bases/tests.testkube.io_tests.yaml
@@ -672,6 +672,9 @@ spec:
                             type: object
                         type: object
                     type: object
+                  sourceScripts:
+                    description: run scripts using source command (container executor only)
+                    type: boolean
                   sync:
                     description: whether to start execution sync or async
                     type: boolean

diff --git a/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml b/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml
@@ -605,6 +605,9 @@ spec:
                                             type: object
                                         type: object
                                     type: object
+                                  sourceScripts:
+                                    description: run scripts using source command (container executor only)
+                                    type: boolean
                                   startTime:
                                     description: test start time
                                     format: date-time
@@ -1163,6 +1166,9 @@ spec:
                                       type: object
                                   type: object
                               type: object
+                            sourceScripts:
+                              description: run scripts using source command (container executor only)
+                              type: boolean
                             startTime:
                               description: test start time
                               format: date-time