feat(template): implements extra variables in the template

api-docs.yml

@@ -796,6 +796,8 @@ definitions:
         type: integer
       autorun:
         type: boolean
+      extra_vars_json:
+        type: string
 
   Template:
     type: object
@@ -860,6 +862,8 @@ definitions:
         type: array
         items:
           $ref: "#/definitions/TemplateVault"
+      extra_vars_json:
+        type: string
 
   TemplateSurveyVar:
     type: object

db/Migration.go

@@ -83,6 +83,7 @@ func GetMigrations() []Migration {
 		{Version: "2.12.5"},
 		{Version: "2.12.15"},
 		{Version: "2.13.0"},
+		{Version: "2.13.6"},
 	}
 }
 

db/Template.go

@@ -146,6 +146,8 @@ type Template struct {
 	TaskParams MapStringAnyField `db:"task_params" json:"task_params"`
 
 	RunnerTag *string `db:"runner_tag" json:"runner_tag"`
+
+	ExtraVarsJSON string `db:"extra_vars_json" json:"extra_vars_json"`
 }
 
 func (tpl *Template) FillParams(target interface{}) error {
@@ -193,6 +195,10 @@ func (tpl *Template) Validate() error {
 		}
 	}
 
+	if tpl.ExtraVarsJSON != "" && !json.Valid([]byte(tpl.ExtraVarsJSON)) {
+		return &ValidationError{"Extra variables must be valid JSON"}
+	}
+
 	return nil
 }
 

db/sql/migrations/v2.13.6.sql

@@ -0,0 +1 @@
+alter table `project__template` add column `extra_vars_json` longtext null;

db/sql/template.go

@@ -19,12 +19,12 @@ func (d *SqlDb) CreateTemplate(template db.Template) (newTemplate db.Template, e
 			"project_id, inventory_id, repository_id, environment_id, name, "+
 			"playbook, arguments, allow_override_args_in_task, description, `type`, "+
 			"start_version, build_template_id, view_id, autorun, survey_vars, "+
-			"suppress_success_alerts, app, git_branch, runner_tag, task_params)"+
+			"suppress_success_alerts, app, git_branch, runner_tag, task_params, extra_vars_json)"+
 			"values ("+
 			"?, ?, ?, ?, ?, "+
 			"?, ?, ?, ?, ?, "+
 			"?, ?, ?, ?, ?, "+
-			"?, ?, ?, ?, ?)",
+			"?, ?, ?, ?, ?, ?)",
 		template.ProjectID,
 		template.InventoryID,
 		template.RepositoryID,
@@ -48,6 +48,7 @@ func (d *SqlDb) CreateTemplate(template db.Template) (newTemplate db.Template, e
 		template.GitBranch,
 		template.RunnerTag,
 		template.TaskParams,
+		template.ExtraVarsJSON,
 	)
 
 	if err != nil {
@@ -97,7 +98,8 @@ func (d *SqlDb) UpdateTemplate(template db.Template) error {
 		"app=?, "+
 		"`git_branch`=?, "+
 		"task_params=?, "+
-		"runner_tag=? "+
+		"runner_tag=?, "+
+		"extra_vars_json=? "+
 		"where id=? and project_id=?",
 		template.InventoryID,
 		template.RepositoryID,
@@ -118,6 +120,7 @@ func (d *SqlDb) UpdateTemplate(template db.Template) error {
 		template.GitBranch,
 		template.TaskParams,
 		template.RunnerTag,
+		template.ExtraVarsJSON,
 		template.ID,
 		template.ProjectID,
 	)

services/tasks/LocalJob.go

@@ -100,6 +100,7 @@ func (t *LocalJob) getEnvironmentExtraVars(username string, incomingVersion *str
 func (t *LocalJob) getEnvironmentExtraVarsJSON(username string, incomingVersion *string) (str string, err error) {
 	extraVars := make(map[string]interface{})
 	extraSecretVars := make(map[string]interface{})
+	extraTemplateVars := make(map[string]interface{})
 
 	if t.Environment.JSON != "" {
 		err = json.Unmarshal([]byte(t.Environment.JSON), &extraVars)
@@ -115,7 +116,15 @@ func (t *LocalJob) getEnvironmentExtraVarsJSON(username string, incomingVersion
 	}
 	t.Secret = "{}"
 
+	if t.Template.ExtraVarsJSON != "" && t.Template.ExtraVarsJSON != "{}" {
+		err = json.Unmarshal([]byte(t.Template.ExtraVarsJSON), &extraTemplateVars)
+		if err != nil {
+			return
+		}
+	}
+
 	maps.Copy(extraVars, extraSecretVars)
+	maps.Copy(extraVars, extraTemplateVars)
 
 	taskDetails := make(map[string]interface{})
 

web/src/components/TemplateForm.vue

@@ -328,6 +328,18 @@
         v-if="needField('allow_debug')"
       />
 
+      <div>
+        {{ $t('templateExtraVariablesJson') }}
+        <codemirror
+          :style="{ border: '1px solid lightgray',
+                    resize: 'vertical', overflow: 'auto',
+                    maxHeight: '400px', minHeight: '50px' }"
+          v-model="item.extra_vars_json"
+          :options="cmOptions"
+          :placeholder="$t('enterTemplateExtraVariablesJson')"
+        />
+      </div>
+
       <!--        <v-checkbox-->
       <!--          class="mt-0"-->
       <!--          :label="$t('allowLimitInTask')"-->
@@ -345,6 +357,10 @@
   color: #a4a4a4 !important;
 }
 
+.CodeMirror {
+  height: 100%;
+}
+
 .TemplateFormBody {
   display: flex;
   flex-direction: column;
@@ -380,6 +396,7 @@
 import axios from 'axios';
 
 import ItemFormBase from '@/components/ItemFormBase';
+import { codemirror } from 'vue-codemirror';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/mode/vue/vue.js';
 import 'codemirror/addon/lint/json-lint.js';
@@ -397,6 +414,7 @@ export default {
     TemplateVaults,
     ArgsPicker,
     SurveyVars,
+    codemirror,
   },
 
   props: {

web/src/lang/en.js

@@ -321,4 +321,7 @@ export default {
   tags: 'Tags',
 
   limit: 'Limit',
+
+  templateExtraVariablesJson: 'Extra variables',
+  enterTemplateExtraVariablesJson: 'Enter extra variables JSON...',
 };