Skip to content

Commit d3a0176

Browse files
committed
refactor(tasks): add tpl param to InstallReqs method
1 parent ebfe164 commit d3a0176

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

db_lib/AnsibleApp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (t *AnsibleApp) Log(msg string) {
6969
t.Logger.Log(msg)
7070
}
7171

72-
func (t *AnsibleApp) InstallRequirements(environmentVars []string, params any) error {
72+
func (t *AnsibleApp) InstallRequirements(environmentVars []string, tplParams any, params any) error {
7373
if err := t.installCollectionsRequirements(); err != nil {
7474
return err
7575
}

db_lib/LocalApp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ type LocalAppRunningArgs struct {
3838

3939
type LocalApp interface {
4040
SetLogger(logger task_logger.Logger) task_logger.Logger
41-
InstallRequirements(environmentVars []string, params any) error
41+
InstallRequirements(environmentVars []string, tplParams any, params any) error
4242
Run(args LocalAppRunningArgs) error
4343
}

db_lib/ShellApp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (t *ShellApp) SetLogger(logger task_logger.Logger) task_logger.Logger {
7474
return logger
7575
}
7676

77-
func (t *ShellApp) InstallRequirements(environmentVars []string, params any) error {
77+
func (t *ShellApp) InstallRequirements(environmentVars []string, tplParams any, params any) error {
7878
return nil
7979
}
8080

db_lib/TerraformApp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (t *TerraformApp) selectWorkspace(workspace string, environmentVars []strin
194194
return nil
195195
}
196196

197-
func (t *TerraformApp) InstallRequirements(environmentVars []string, params any) (err error) {
197+
func (t *TerraformApp) InstallRequirements(environmentVars []string, tplParams any, params any) (err error) {
198198

199199
p := params.(*db.TerraformTaskParams)
200200

services/tasks/LocalJob.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
549549
environmentVariables = append(environmentVariables, "TF_HTTP_ADDRESS="+util.GetPublicAliasURL("terraform", alias))
550550
}
551551

552-
err = t.prepareRun(environmentVariables, params)
552+
err = t.prepareRun(environmentVariables, tplParams, params)
553553
if err != nil {
554554
return err
555555
}
@@ -609,7 +609,7 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
609609

610610
}
611611

612-
func (t *LocalJob) prepareRun(environmentVars []string, params any) error {
612+
func (t *LocalJob) prepareRun(environmentVars []string, tplParams any, params any) error {
613613

614614
t.Log("Preparing: " + strconv.Itoa(t.Task.ID))
615615

@@ -649,7 +649,7 @@ func (t *LocalJob) prepareRun(environmentVars []string, params any) error {
649649
return err
650650
}
651651

652-
if err := t.App.InstallRequirements(environmentVars, params); err != nil {
652+
if err := t.App.InstallRequirements(environmentVars, tplParams, params); err != nil {
653653
t.Log("Failed to install requirements: " + err.Error())
654654
return err
655655
}
@@ -725,7 +725,11 @@ func (t *LocalJob) checkoutRepository() error {
725725
return err
726726
}
727727

728-
commitMessage, _ := repo.GetLastCommitMessage()
728+
commitMessage, err := repo.GetLastCommitMessage()
729+
730+
if err != nil {
731+
t.Log(err.Error())
732+
}
729733

730734
t.SetCommit(commitHash, commitMessage)
731735

0 commit comments

Comments
 (0)