From c91b428de4d9502b8f120897942940e3e95784c5 Mon Sep 17 00:00:00 2001
From: Denis Gukov <denguk@gmail.com>
Date: Mon, 2 Dec 2024 01:49:10 +0500
Subject: [PATCH] fix(tf): remove semaphore_vars

---
 services/tasks/LocalJob.go            | 10 ++---
 web/src/components/TaskParamsForm.vue | 59 ++++++++++++++++++---------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/services/tasks/LocalJob.go b/services/tasks/LocalJob.go
index c0d46e62..f1038186 100644
--- a/services/tasks/LocalJob.go
+++ b/services/tasks/LocalJob.go
@@ -249,14 +249,10 @@ func (t *LocalJob) getTerraformArgs(username string, incomingVersion *string) (a
 	}
 
 	for name, value := range extraVars {
-
-		var v []byte
-		v, err = json.Marshal(value)
-		if err != nil {
-			return
+		if name == "semaphore_vars" {
+			continue
 		}
-
-		args = append(args, "-var", fmt.Sprintf("%s=%s", name, v))
+		args = append(args, "-var", fmt.Sprintf("%s=%s", name, value))
 	}
 
 	for _, secret := range t.Environment.Secrets {
diff --git a/web/src/components/TaskParamsForm.vue b/web/src/components/TaskParamsForm.vue
index 4d516a9c..b86ee077 100644
--- a/web/src/components/TaskParamsForm.vue
+++ b/web/src/components/TaskParamsForm.vue
@@ -37,24 +37,43 @@
     </v-row>
   </div>
   <div v-else-if="app === 'terraform' || app === 'tofu'">
-    <v-checkbox
-      class="mt-0"
-      :input-value="params.plan"
-      @change="updateValue('plan', $event)"
-    >
-      <template v-slot:label>
-        <div class="text-no-wrap">{{ $t('Plan') }}</div>
-      </template>
-    </v-checkbox>
-    <v-checkbox
-      class="mt-0"
-      :input-value="params.auto_approve"
-      @change="updateValue('auto_approve', $event)"
-    >
-      <template v-slot:label>
-        <div class="text-no-wrap">{{ $t('Auto Approve') }} <code>-auto-approve</code></div>
-      </template>
-    </v-checkbox>
+    <v-row no-gutters class="mt-6">
+      <v-col cols="12" sm="6">
+        <v-checkbox
+          class="mt-0"
+          :input-value="params.plan"
+          @change="updateValue('plan', $event)"
+        >
+          <template v-slot:label>
+            <div class="text-no-wrap">{{ $t('Plan') }}</div>
+          </template>
+        </v-checkbox>
+      </v-col>
+
+      <v-col cols="12" sm="6">
+        <v-checkbox
+          class="mt-0"
+          :input-value="params.destroy"
+          @change="updateValue('destroy', $event)"
+        >
+          <template v-slot:label>
+            <div class="text-no-wrap">{{ $t('Destroy') }} <code>-destroy</code></div>
+          </template>
+        </v-checkbox>
+      </v-col>
+
+      <v-col cols="12" sm="6">
+        <v-checkbox
+          class="mt-0"
+          :input-value="params.auto_approve"
+          @change="updateValue('auto_approve', $event)"
+        >
+          <template v-slot:label>
+            <div class="text-no-wrap">{{ $t('Auto Approve') }} <code>-auto-approve</code></div>
+          </template>
+        </v-checkbox>
+      </v-col>
+    </v-row>
   </div>
   <div v-else></div>
 </template>
@@ -66,8 +85,8 @@
 <script>
 
 const APP_PARAMS = {
-  terraform: ['plan', 'auto_approve'],
-  tofu: ['plan', 'auto_approve'],
+  terraform: ['plan', 'auto_approve', 'destroy'],
+  tofu: ['plan', 'auto_approve', 'destroy'],
   ansible: ['diff', 'debug', 'dry_run'],
 };