fix(ansible): init vaults before getting ansible params

semaphoreui · Dec 18, 2024 · d8aba18 · d8aba18
1 parent cef857c
commit d8aba18
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 19 deletions.
diff --git a/db/Task.go b/db/Task.go
@@ -73,7 +73,7 @@ type Task struct {
 	Params MapStringAnyField `db:"params" json:"params"`
 }
 
-func (task *Task) GetParams(target interface{}) (err error) {
+func (task *Task) FillParams(target interface{}) (err error) {
 	content, err := json.Marshal(task.Params)
 	if err != nil {
 		return
@@ -159,7 +159,7 @@ func (task *Task) ValidateNewTask(template Template) error {
 		params = &DefaultTaskParams{}
 	}
 
-	return task.GetParams(params)
+	return task.FillParams(params)
 }
 
 func (task *TaskWithTpl) Fill(d Store) error {

diff --git a/services/tasks/LocalJob.go b/services/tasks/LocalJob.go
@@ -243,7 +243,7 @@ func (t *LocalJob) getTerraformArgs(username string, incomingVersion *string) (a
 	}
 
 	var params db.TerraformTaskParams
-	err = t.Task.GetParams(&params)
+	err = t.Task.FillParams(&params)
 	if err != nil {
 		return
 	}
@@ -339,7 +339,7 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
 
 	var params db.AnsibleTaskParams
 
-	err = t.Task.GetParams(&params)
+	err = t.Task.FillParams(&params)
 	if err != nil {
 		return
 	}
@@ -419,6 +419,25 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
 	return
 }
 
+func (t *LocalJob) getParams() (params interface{}, err error) {
+	switch t.Template.App {
+	case db.AppAnsible:
+		params = &db.AnsibleTaskParams{}
+	case db.AppTerraform, db.AppTofu:
+		params = &db.TerraformTaskParams{}
+	default:
+		params = &db.DefaultTaskParams{}
+	}
+
+	err = t.Task.FillParams(params)
+
+	if err != nil {
+		return
+	}
+
+	return
+}
+
 func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (err error) {
 
 	defer func() {
@@ -433,40 +452,35 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
 		return
 	}
 
+	params, err := t.getParams()
+	if err != nil {
+		return
+	}
+
+	err = t.prepareRun(&environmentVariables, params)
+	if err != nil {
+		return err
+	}
+
 	var args []string
 	var inputs map[string]string
-	var params interface{}
 
 	switch t.Template.App {
 	case db.AppAnsible:
 		args, inputs, err = t.getPlaybookArgs(username, incomingVersion)
-		params = &db.AnsibleTaskParams{}
 	case db.AppTerraform, db.AppTofu:
 		args, err = t.getTerraformArgs(username, incomingVersion)
-		params = &db.TerraformTaskParams{}
 		if alias != "" {
 			environmentVariables = append(environmentVariables, "TF_HTTP_ADDRESS="+util.GetPublicAliasURL("terraform", alias))
 		}
 	default:
 		args, err = t.getShellArgs(username, incomingVersion)
-		params = &db.DefaultTaskParams{}
 	}
 
 	if err != nil {
 		return
 	}
 
-	err = t.Task.GetParams(params)
-
-	if err != nil {
-		return
-	}
-
-	err = t.prepareRun(&environmentVariables, params)
-	if err != nil {
-		return err
-	}
-
 	if t.Inventory.SSHKey.Type == db.AccessKeySSH && t.Inventory.SSHKeyID != nil {
 		environmentVariables = append(environmentVariables, fmt.Sprintf("SSH_AUTH_SOCK=%s", t.sshKeyInstallation.SSHAgent.SocketFile))
 	}