fix: template

Signed-off-by: Vladislav Sukhin <vladislav@kubeshop.io>
kubeshop · Jan 17, 2025 · ef8ee09 · ef8ee09
1 parent f1d992b
commit ef8ee09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/pkg/crd/crd_test.go b/pkg/crd/crd_test.go
@@ -12,7 +12,7 @@ func TestGenerateYAML(t *testing.T) {
 
 	t.Run("generate single CRD yaml", func(t *testing.T) {
 		// given
-		expected := "apiVersion: executor.testkube.io/v1\nkind: Webhook\nmetadata:\n  name: name1\n  namespace: namespace1\n  labels:\n    key1: value1\n  annotations:\n    key2: value2  \nspec:\n  events:\n  - start-test\n  uri: http://localhost\n  selector: app=backend\n  payloadObjectField: text\n  payloadTemplate: {{ .Id }}\n  payloadTemplateReference: ref\n  headers:\n    Content-Type: appication/xml\n  disabled: true\n  config:\n    var1:\n      value: pb\n    var2:\n      secret:\n        namespace: ns\n        name: secret\n        key: pr\n  parameters:\n      name: var3\n      description: descr\n      required: true\n      example: 12345\n      default: 0\n      pattern: [0-9]*\n  webhookTemplateRef:\n    name: tmpl\n"
+		expected := "apiVersion: executor.testkube.io/v1\nkind: Webhook\nmetadata:\n  name: name1\n  namespace: namespace1\n  labels:\n    key1: value1\n  annotations:\n    key2: value2  \nspec:\n  events:\n  - start-test\n  uri: http://localhost\n  selector: app=backend\n  payloadObjectField: text\n  payloadTemplate: {{ .Id }}\n  payloadTemplateReference: ref\n  headers:\n    Content-Type: appication/xml\n  disabled: true\n  config:\n    var1:\n      value: pb\n    var2:\n      secret:\n        namespace: ns\n        name: secret\n        key: pr\n  parameters:\n    - name: var3\n      description: descr\n      required: true\n      example: 12345\n      default: 0\n      pattern: [0-9]*\n  webhookTemplateRef:\n    name: tmpl\n"
 		webhooks := []testkube.Webhook{
 			{
 				Name:                     "name1",
@@ -58,7 +58,7 @@ func TestGenerateYAML(t *testing.T) {
 
 	t.Run("generate multiple CRDs yaml", func(t *testing.T) {
 		// given
-		expected := "apiVersion: executor.testkube.io/v1\nkind: Webhook\nmetadata:\n  name: name1\n  namespace: namespace1\n  labels:\n    key1: value1\n  annotations:\n    key3: value3  \nspec:\n  events:\n  - start-test\n  uri: http://localhost\n  selector: app=backend\n  payloadObjectField: text\n  payloadTemplate: {{ .Id }}\n  payloadTemplateReference: ref\n  headers:\n    Content-Type: appication/xml\n  disabled: true\n  config:\n    var1:\n      value: pb\n    var2:\n      secret:\n        namespace: ns\n        name: secret\n        key: pr\n  parameters:\n      name: var3\n      description: descr\n      required: true\n      example: 12345\n      default: 0\n      pattern: [0-9]*\n  webhookTemplateRef:\n    name: tmpl\n\n---\napiVersion: executor.testkube.io/v1\nkind: Webhook\nmetadata:\n  name: name2\n  namespace: namespace2\n  labels:\n    key2: value2\n  annotations:\n    key4: value4  \nspec:\n  events:\n  - end-test-success\n  uri: http://localhost\n  selector: app=backend\n  payloadObjectField: text\n  payloadTemplate: {{ .Id }}\n  payloadTemplateReference: ref\n  headers:\n    Content-Type: appication/xml\n  disabled: true\n  config:\n    var1:\n      value: pb\n    var2:\n      secret:\n        namespace: ns\n        name: secret\n        key: pr\n  parameters:\n      name: var3\n      description: descr\n      required: true\n      example: 12345\n      default: 0\n      pattern: [0-9]*\n  webhookTemplateRef:\n    name: tmpl\n"
+		expected := "apiVersion: executor.testkube.io/v1\nkind: Webhook\nmetadata:\n  name: name1\n  namespace: namespace1\n  labels:\n    key1: value1\n  annotations:\n    key3: value3  \nspec:\n  events:\n  - start-test\n  uri: http://localhost\n  selector: app=backend\n  payloadObjectField: text\n  payloadTemplate: {{ .Id }}\n  payloadTemplateReference: ref\n  headers:\n    Content-Type: appication/xml\n  disabled: true\n  config:\n    var1:\n      value: pb\n    var2:\n      secret:\n        namespace: ns\n        name: secret\n        key: pr\n  parameters:\n    - name: var3\n      description: descr\n      required: true\n      example: 12345\n      default: 0\n      pattern: [0-9]*\n  webhookTemplateRef:\n    name: tmpl\n\n---\napiVersion: executor.testkube.io/v1\nkind: Webhook\nmetadata:\n  name: name2\n  namespace: namespace2\n  labels:\n    key2: value2\n  annotations:\n    key4: value4  \nspec:\n  events:\n  - end-test-success\n  uri: http://localhost\n  selector: app=backend\n  payloadObjectField: text\n  payloadTemplate: {{ .Id }}\n  payloadTemplateReference: ref\n  headers:\n    Content-Type: appication/xml\n  disabled: true\n  config:\n    var1:\n      value: pb\n    var2:\n      secret:\n        namespace: ns\n        name: secret\n        key: pr\n  parameters:\n    - name: var3\n      description: descr\n      required: true\n      example: 12345\n      default: 0\n      pattern: [0-9]*\n  webhookTemplateRef:\n    name: tmpl\n"
 		webhooks := []testkube.Webhook{
 			{
 				Name:                     "name1",

diff --git a/pkg/crd/templates/webhook.tmpl b/pkg/crd/templates/webhook.tmpl
@@ -64,9 +64,7 @@ spec:
   {{- if ne (len .Parameters) 0 }}
   parameters:
   {{- range $parameter := .Parameters }}
-    {{- if $parameter.Name }}
-      name: {{ $parameter.Name }}
-    {{- end }}
+    - name: {{ $parameter.Name }}
     {{- if $parameter.Description }}
       description: {{ $parameter.Description }}
     {{- end }}

diff --git a/pkg/crd/templates/webhooktemplate.tmpl b/pkg/crd/templates/webhooktemplate.tmpl
@@ -64,9 +64,7 @@ spec:
   {{- if ne (len .Parameters) 0 }}
   parameters:
   {{- range $parameter := .Parameters }}
-    {{- if $parameter.Name }}
-      name: {{ $parameter.Name }}
-    {{- end }}
+    - name: {{ $parameter.Name }}
     {{- if $parameter.Description }}
       description: {{ $parameter.Description }}
     {{- end }}