@@ -243,7 +243,7 @@ func (t *LocalJob) getTerraformArgs(username string, incomingVersion *string) (a
243
243
}
244
244
245
245
var params db.TerraformTaskParams
246
- err = t .Task .GetParams (& params )
246
+ err = t .Task .FillParams (& params )
247
247
if err != nil {
248
248
return
249
249
}
@@ -339,7 +339,7 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
339
339
340
340
var params db.AnsibleTaskParams
341
341
342
- err = t .Task .GetParams (& params )
342
+ err = t .Task .FillParams (& params )
343
343
if err != nil {
344
344
return
345
345
}
@@ -419,6 +419,25 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
419
419
return
420
420
}
421
421
422
+ func (t * LocalJob ) getParams () (params interface {}, err error ) {
423
+ switch t .Template .App {
424
+ case db .AppAnsible :
425
+ params = & db.AnsibleTaskParams {}
426
+ case db .AppTerraform , db .AppTofu :
427
+ params = & db.TerraformTaskParams {}
428
+ default :
429
+ params = & db.DefaultTaskParams {}
430
+ }
431
+
432
+ err = t .Task .FillParams (params )
433
+
434
+ if err != nil {
435
+ return
436
+ }
437
+
438
+ return
439
+ }
440
+
422
441
func (t * LocalJob ) Run (username string , incomingVersion * string , alias string ) (err error ) {
423
442
424
443
defer func () {
@@ -433,40 +452,35 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
433
452
return
434
453
}
435
454
455
+ params , err := t .getParams ()
456
+ if err != nil {
457
+ return
458
+ }
459
+
460
+ err = t .prepareRun (& environmentVariables , params )
461
+ if err != nil {
462
+ return err
463
+ }
464
+
436
465
var args []string
437
466
var inputs map [string ]string
438
- var params interface {}
439
467
440
468
switch t .Template .App {
441
469
case db .AppAnsible :
442
470
args , inputs , err = t .getPlaybookArgs (username , incomingVersion )
443
- params = & db.AnsibleTaskParams {}
444
471
case db .AppTerraform , db .AppTofu :
445
472
args , err = t .getTerraformArgs (username , incomingVersion )
446
- params = & db.TerraformTaskParams {}
447
473
if alias != "" {
448
474
environmentVariables = append (environmentVariables , "TF_HTTP_ADDRESS=" + util .GetPublicAliasURL ("terraform" , alias ))
449
475
}
450
476
default :
451
477
args , err = t .getShellArgs (username , incomingVersion )
452
- params = & db.DefaultTaskParams {}
453
478
}
454
479
455
480
if err != nil {
456
481
return
457
482
}
458
483
459
- err = t .Task .GetParams (params )
460
-
461
- if err != nil {
462
- return
463
- }
464
-
465
- err = t .prepareRun (& environmentVariables , params )
466
- if err != nil {
467
- return err
468
- }
469
-
470
484
if t .Inventory .SSHKey .Type == db .AccessKeySSH && t .Inventory .SSHKeyID != nil {
471
485
environmentVariables = append (environmentVariables , fmt .Sprintf ("SSH_AUTH_SOCK=%s" , t .sshKeyInstallation .SSHAgent .SocketFile ))
472
486
}
0 commit comments