From ff05180cb9d696b112a3bd9132c41a2f04af5b52 Mon Sep 17 00:00:00 2001
From: qiaozp <47812250+chivalryq@users.noreply.github.com>
Date: Mon, 13 Feb 2023 11:08:04 +0800
Subject: [PATCH] Fix: apply-terraform-provider and container-image definition
 (#5485)

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
---
 .../templates/defwithtemplate/apply-terraform-provider.yaml     | 2 +-
 charts/vela-core/templates/defwithtemplate/container-image.yaml | 2 +-
 .../templates/defwithtemplate/apply-terraform-provider.yaml     | 2 +-
 .../vela-minimal/templates/defwithtemplate/container-image.yaml | 2 +-
 vela-templates/definitions/internal/trait/container-image.cue   | 2 +-
 .../internal/workflowstep/apply-terraform-provider.cue          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/vela-core/templates/defwithtemplate/apply-terraform-provider.yaml b/charts/vela-core/templates/defwithtemplate/apply-terraform-provider.yaml
index 67c58447a..e5c42ca1b 100644
--- a/charts/vela-core/templates/defwithtemplate/apply-terraform-provider.yaml
+++ b/charts/vela-core/templates/defwithtemplate/apply-terraform-provider.yaml
@@ -116,7 +116,7 @@ spec:
         #ECProvider: {
         	type:   "ec"
         	apiKey: *"" | string
-        	name:   "ec-provider" | string
+        	name:   *"ec-provider" | string
         }
         #GCPProvider: {
         	credentials: string
diff --git a/charts/vela-core/templates/defwithtemplate/container-image.yaml b/charts/vela-core/templates/defwithtemplate/container-image.yaml
index 05eae9641..fdfed51e0 100644
--- a/charts/vela-core/templates/defwithtemplate/container-image.yaml
+++ b/charts/vela-core/templates/defwithtemplate/container-image.yaml
@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: *#PatchParams | close({
+        parameter: #PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })
diff --git a/charts/vela-minimal/templates/defwithtemplate/apply-terraform-provider.yaml b/charts/vela-minimal/templates/defwithtemplate/apply-terraform-provider.yaml
index 67c58447a..e5c42ca1b 100644
--- a/charts/vela-minimal/templates/defwithtemplate/apply-terraform-provider.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/apply-terraform-provider.yaml
@@ -116,7 +116,7 @@ spec:
         #ECProvider: {
         	type:   "ec"
         	apiKey: *"" | string
-        	name:   "ec-provider" | string
+        	name:   *"ec-provider" | string
         }
         #GCPProvider: {
         	credentials: string
diff --git a/charts/vela-minimal/templates/defwithtemplate/container-image.yaml b/charts/vela-minimal/templates/defwithtemplate/container-image.yaml
index 05eae9641..fdfed51e0 100644
--- a/charts/vela-minimal/templates/defwithtemplate/container-image.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/container-image.yaml
@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: *#PatchParams | close({
+        parameter: #PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })
diff --git a/vela-templates/definitions/internal/trait/container-image.cue b/vela-templates/definitions/internal/trait/container-image.cue
index 7e29dff3e..904f10a29 100644
--- a/vela-templates/definitions/internal/trait/container-image.cue
+++ b/vela-templates/definitions/internal/trait/container-image.cue
@@ -64,7 +64,7 @@ template: {
 		}
 	}
 
-	parameter: *#PatchParams | close({
+	parameter: #PatchParams | close({
 		// +usage=Specify the container image for multiple containers
 		containers: [...#PatchParams]
 	})
diff --git a/vela-templates/definitions/internal/workflowstep/apply-terraform-provider.cue b/vela-templates/definitions/internal/workflowstep/apply-terraform-provider.cue
index 737bb6e82..4404d389a 100644
--- a/vela-templates/definitions/internal/workflowstep/apply-terraform-provider.cue
+++ b/vela-templates/definitions/internal/workflowstep/apply-terraform-provider.cue
@@ -113,7 +113,7 @@ template: {
 	#ECProvider: {
 		type:   "ec"
 		apiKey: *"" | string
-		name:   "ec-provider" | string
+		name:   *"ec-provider" | string
 	}
 	#GCPProvider: {
 		credentials: string