feat: refactor disabling webhook (#284)

* feat: deperecate disabling webhook Signed-off-by: Vladislav Sukhin <[email protected]> * fix: add disable webhooks for twe Signed-off-by: Vladislav Sukhin <[email protected]> * fix: add disable webhooks to executions Signed-off-by: Vladislav Sukhin <[email protected]> --------- Signed-off-by: Vladislav Sukhin <[email protected]>
kubeshop · Jul 16, 2024 · a1fa1f1 · a1fa1f1
1 parent 77e0cc1
commit a1fa1f1
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 16 deletions.
diff --git a/api/testexecution/v1/testexecution_types.go b/api/testexecution/v1/testexecution_types.go
@@ -145,7 +145,7 @@ type ExecutionRequest struct {
 	// namespace for test execution (Pro edition only)
 	ExecutionNamespace string `json:"executionNamespace,omitempty"`
 	// whether webhooks should be called on execution
-	DisableWebhooks *bool `json:"disableWebhooks,omitempty"`
+	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
 // ArgsModeType defines args mode type
@@ -276,6 +276,8 @@ type Execution struct {
 	SlavePodRequest *PodRequest `json:"slavePodRequest,omitempty"`
 	// namespace for test execution (Pro edition only)
 	ExecutionNamespace string `json:"executionNamespace,omitempty"`
+	// whether webhooks should be called on execution
+	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
 // TestContent defines test content

diff --git a/api/testexecution/v1/zz_generated.deepcopy.go b/api/testexecution/v1/zz_generated.deepcopy.go
diff --git a/api/tests/v3/test_types.go b/api/tests/v3/test_types.go
@@ -247,6 +247,7 @@ type ExecutionRequest struct {
 	// namespace for test execution (Pro edition only)
 	ExecutionNamespace string `json:"executionNamespace,omitempty"`
 	// whether webhooks should be called on execution
+	// Deprecated: field is not used
 	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 

diff --git a/api/testsuite/v3/testsuite_types.go b/api/testsuite/v3/testsuite_types.go
@@ -130,6 +130,7 @@ type TestSuiteExecutionRequest struct {
 	// name of the template resource
 	PvcTemplateReference string `json:"pvcTemplateReference,omitempty"`
 	// whether webhooks should be called on execution
+	// Deprecated: field is not used
 	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
@@ -235,5 +236,6 @@ type TestSuiteStepExecutionRequest struct {
 	PvcTemplateReference string                   `json:"pvcTemplateReference,omitempty"`
 	RunningContext       *commonv1.RunningContext `json:"runningContext,omitempty"`
 	// whether webhooks should be called on execution
+	// Deprecated: field is not used
 	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
diff --git a/api/testsuiteexecution/v1/testsuiteexecution_types.go b/api/testsuiteexecution/v1/testsuiteexecution_types.go
@@ -98,6 +98,8 @@ type TestSuiteExecutionRequest struct {
 	ConcurrencyLevel int32 `json:"concurrencyLevel,omitempty"`
 	// test suite execution name started the test suite execution
 	TestSuiteExecutionName string `json:"testSuiteExecutionName,omitempty"`
+	// whether webhooks should be disabled for this execution
+	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
 type ObjectRef struct {
@@ -156,6 +158,8 @@ type SuiteExecution struct {
 	RunningContext *RunningContext   `json:"runningContext,omitempty"`
 	// test suite execution name started the test suite execution
 	TestSuiteExecutionName string `json:"testSuiteExecutionName,omitempty"`
+	// whether webhooks should be disabled for this execution
+	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
 // execution result returned from executor

diff --git a/api/testworkflows/v1/base_types.go b/api/testworkflows/v1/base_types.go
@@ -22,5 +22,6 @@ type TestWorkflowSpecBase struct {
 	Pod *PodConfig `json:"pod,omitempty" expr:"include"`
 
 	// configuration for notifications
+	// Deprecated: field is not used
 	Notifications *NotificationsConfig `json:"notifications,omitempty" expr:"include"`
 }
diff --git a/api/testworkflows/v1/testworkflowexecution_types.go b/api/testworkflows/v1/testworkflowexecution_types.go
@@ -35,6 +35,8 @@ type TestWorkflowExecutionRequest struct {
 	Config map[string]intstr.IntOrString `json:"config,omitempty" expr:"template"`
 	// test workflow execution name started the test workflow execution
 	TestWorkflowExecutionName string `json:"testWorkflowExecutionName,omitempty" expr:"template"`
+	// whether webhooks should be disabled for this execution
+	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
 // TestWorkflowExecutionStatus defines the observed state of TestWorkflowExecution
@@ -75,6 +77,8 @@ type TestWorkflowExecutionDetails struct {
 	ResolvedWorkflow *TestWorkflow `json:"resolvedWorkflow,omitempty"`
 	// test workflow execution name started the test workflow execution
 	TestWorkflowExecutionName string `json:"testWorkflowExecutionName,omitempty"`
+	// whether webhooks should be disabled for this execution
+	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 }
 
 // TestWorkflowSignature has signature of TestWorkflow

diff --git a/config/crd/bases/tests.testkube.io_testexecutions.yaml b/config/crd/bases/tests.testkube.io_testexecutions.yaml
@@ -599,6 +599,9 @@ spec:
                         description: uri of test content
                         type: string
                     type: object
+                  disableWebhooks:
+                    description: whether webhooks should be called on execution
+                    type: boolean
                   duration:
                     description: test duration
                     type: string

diff --git a/config/crd/bases/tests.testkube.io_tests.yaml b/config/crd/bases/tests.testkube.io_tests.yaml
@@ -523,7 +523,9 @@ spec:
                     description: name of the template resource
                     type: string
                   disableWebhooks:
-                    description: whether webhooks should be called on execution
+                    description: |-
+                      whether webhooks should be called on execution
+                      Deprecated: field is not used
                     type: boolean
                   envConfigMaps:
                     description: config map references

diff --git a/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml b/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml
@@ -72,6 +72,9 @@ spec:
                   cronJobTemplate:
                     description: cron job template extensions
                     type: string
+                  disableWebhooks:
+                    description: whether webhooks should be disabled for this execution
+                    type: boolean
                   executionLabels:
                     additionalProperties:
                       type: string
@@ -262,6 +265,9 @@ spec:
                   INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
                   Important: Run "make" to regenerate code after modifying this file
                 properties:
+                  disableWebhooks:
+                    description: whether webhooks should be disabled for this execution
+                    type: boolean
                   duration:
                     description: test duration
                     type: string

diff --git a/config/crd/bases/tests.testkube.io_testsuites.yaml b/config/crd/bases/tests.testkube.io_testsuites.yaml
@@ -645,8 +645,9 @@ spec:
                                 description: cron job template extensions reference
                                 type: string
                               disableWebhooks:
-                                description: whether webhooks should be called on
-                                  execution
+                                description: |-
+                                  whether webhooks should be called on execution
+                                  Deprecated: field is not used
                                 type: boolean
                               executionLabels:
                                 additionalProperties:
@@ -879,8 +880,9 @@ spec:
                                 description: cron job template extensions reference
                                 type: string
                               disableWebhooks:
-                                description: whether webhooks should be called on
-                                  execution
+                                description: |-
+                                  whether webhooks should be called on execution
+                                  Deprecated: field is not used
                                 type: boolean
                               executionLabels:
                                 additionalProperties:
@@ -1062,7 +1064,9 @@ spec:
                     description: name of the template resource
                     type: string
                   disableWebhooks:
-                    description: whether webhooks should be called on execution
+                    description: |-
+                      whether webhooks should be called on execution
+                      Deprecated: field is not used
                     type: boolean
                   executionLabels:
                     additionalProperties:
@@ -1285,8 +1289,9 @@ spec:
                                 description: cron job template extensions reference
                                 type: string
                               disableWebhooks:
-                                description: whether webhooks should be called on
-                                  execution
+                                description: |-
+                                  whether webhooks should be called on execution
+                                  Deprecated: field is not used
                                 type: boolean
                               executionLabels:
                                 additionalProperties:

diff --git a/config/crd/bases/testworkflows.testkube.io_testworkflowexecutions.yaml b/config/crd/bases/testworkflows.testkube.io_testworkflowexecutions.yaml
@@ -49,6 +49,9 @@ spec:
                           - type: string
                         x-kubernetes-int-or-string: true
                       type: object
+                    disableWebhooks:
+                      description: whether webhooks should be disabled for this execution
+                      type: boolean
                     name:
                       description: custom execution name
                       type: string
@@ -84,6 +87,9 @@ spec:
                     INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
                     Important: Run "make" to regenerate code after modifying this file
                   properties:
+                    disableWebhooks:
+                      description: whether webhooks should be disabled for this execution
+                      type: boolean
                     id:
                       description: unique execution identifier
                       type: string

diff --git a/config/crd/bases/testworkflows.testkube.io_testworkflows.yaml b/config/crd/bases/testworkflows.testkube.io_testworkflows.yaml
@@ -3610,7 +3610,9 @@ spec:
                       type: string
                   type: object
                 notifications:
-                  description: configuration for notifications
+                  description: |-
+                    configuration for notifications
+                    Deprecated: field is not used
                   properties:
                     disableWebhooks:
                       type: boolean

diff --git a/config/crd/bases/testworkflows.testkube.io_testworkflowtemplates.yaml b/config/crd/bases/testworkflows.testkube.io_testworkflowtemplates.yaml
@@ -3536,7 +3536,9 @@ spec:
                       type: string
                   type: object
                 notifications:
-                  description: configuration for notifications
+                  description: |-
+                    configuration for notifications
+                    Deprecated: field is not used
                   properties:
                     disableWebhooks:
                       type: boolean