Move the conditionals check to the tasks shared directory

Author: morestatic

tasks/cmdrun/crtask.go

@@ -9,6 +9,7 @@ import (
 
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
 	"github.com/realvnc-labs/tacoscript/tasks"
+	"github.com/realvnc-labs/tacoscript/tasks/shared/conditionals"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/executionresult"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/names"
 
@@ -110,7 +111,7 @@ func (crte *Executor) Execute(ctx context.Context, task tasks.CoreTask) executio
 		Shell:        cmdRunTask.Shell,
 	}
 
-	shouldNotBeExecutedReason, err := tasks.CheckConditionals(execCtx, crte.FsManager, crte.Runner, cmdRunTask)
+	shouldNotBeExecutedReason, err := conditionals.Check(execCtx, crte.FsManager, crte.Runner, cmdRunTask)
 	if err != nil {
 		execRes.Err = err
 		return execRes

tasks/filemanaged/fmtask.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/realvnc-labs/tacoscript/tasks"
+	"github.com/realvnc-labs/tacoscript/tasks/shared/conditionals"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/executionresult"
 
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
@@ -145,7 +146,7 @@ func (fmte *Executor) Execute(ctx context.Context, task tasks.CoreTask) executio
 
 	logrus.Debugf("will check if the task '%s' should be executed", task.GetPath())
 
-	skipReason, err := tasks.CheckConditionals(execCtx, fmte.FsManager, fmte.Runner, fileManagedTask)
+	skipReason, err := conditionals.Check(execCtx, fmte.FsManager, fmte.Runner, fileManagedTask)
 	if err != nil {
 		execRes.Err = err
 		return execRes

tasks/filereplace/frtask.go

@@ -11,6 +11,7 @@ import (
 	"github.com/realvnc-labs/tacoscript/conv"
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
 	"github.com/realvnc-labs/tacoscript/tasks"
+	"github.com/realvnc-labs/tacoscript/tasks/shared/conditionals"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/executionresult"
 	"github.com/realvnc-labs/tacoscript/utils"
 	"github.com/sirupsen/logrus"
@@ -150,7 +151,7 @@ func (frte *Executor) Execute(ctx context.Context, task tasks.CoreTask) executio
 	}
 
 	logrus.Debugf("will check if the task '%s' should be executed", task.GetPath())
-	skipReason, err := tasks.CheckConditionals(execCtx, frte.FsManager, frte.Runner, frt)
+	skipReason, err := conditionals.Check(execCtx, frte.FsManager, frte.Runner, frt)
 	if err != nil {
 		execRes.Err = err
 		return execRes

tasks/pkgtask/pkgTask.go

@@ -9,6 +9,7 @@ import (
 
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
 	"github.com/realvnc-labs/tacoscript/tasks"
+	"github.com/realvnc-labs/tacoscript/tasks/shared/conditionals"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/executionresult"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/names"
 
@@ -129,7 +130,7 @@ func (pte *Executor) Execute(ctx context.Context, task tasks.CoreTask) execution
 	}
 
 	logrus.Debugf("will check if the task '%s' should be executed", task.GetPath())
-	skipReason, err := tasks.CheckConditionals(execCtx, pte.FsManager, pte.Runner, pkgTask)
+	skipReason, err := conditionals.Check(execCtx, pte.FsManager, pte.Runner, pkgTask)
 	if err != nil {
 		execRes.Err = err
 		return execRes

tasks/realvncserver/rvstask.go

@@ -12,6 +12,7 @@ import (
 
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
 	"github.com/realvnc-labs/tacoscript/tasks"
+	"github.com/realvnc-labs/tacoscript/tasks/shared/conditionals"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/executionresult"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/fieldstatus"
 )
@@ -184,7 +185,7 @@ func (rvste *Executor) Execute(ctx context.Context, task tasks.CoreTask) executi
 	}
 
 	logrus.Debugf("will check if the task '%s' should be executed", task.GetPath())
-	skipReason, err := tasks.CheckConditionals(execCtx, rvste.FsManager, rvste.Runner, rvst)
+	skipReason, err := conditionals.Check(execCtx, rvste.FsManager, rvste.Runner, rvst)
 	if err != nil {
 		execRes.Err = err
 		return execRes

tasks/conditionals.go renamed to tasks/shared/conditionals/conditionals.go

@@ -1,14 +1,17 @@
-package tasks
+package conditionals
 
 import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
 
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
+	"github.com/realvnc-labs/tacoscript/tasks"
 )
 
-func CheckConditionals(ctx *tacoexec.Context, fsManager FsManager, runner tacoexec.Runner, task CoreTask) (
+const onlyIfConditionFailedReason = "only if condition was false"
+
+func Check(ctx *tacoexec.Context, fsManager tasks.FsManager, runner tacoexec.Runner, task tasks.CoreTask) (
 	skipExecutionReason string, err error) {
 	defer func() {
 		if skipExecutionReason != "" {
@@ -50,7 +53,7 @@ func CheckConditionals(ctx *tacoexec.Context, fsManager FsManager, runner tacoex
 	return "", nil
 }
 
-func checkMissingFileCondition(fsManager FsManager, task CoreTask) (isExists bool, filename string, err error) {
+func checkMissingFileCondition(fsManager tasks.FsManager, task tasks.CoreTask) (isExists bool, filename string, err error) {
 	createsFilesList := task.GetCreatesFilesList()
 
 	if len(createsFilesList) == 0 {
@@ -83,7 +86,7 @@ func runCommands(ctx *tacoexec.Context, runner tacoexec.Runner, cmds []string) (
 	return runner.Run(&newCtx)
 }
 
-func checkUnless(ctx *tacoexec.Context, runner tacoexec.Runner, task CoreTask) (isExpectationSuccess bool, err error) {
+func checkUnless(ctx *tacoexec.Context, runner tacoexec.Runner, task tasks.CoreTask) (isExpectationSuccess bool, err error) {
 	cmds := task.GetUnlessCmds()
 	if len(cmds) == 0 {
 		return true, nil
@@ -104,7 +107,7 @@ func checkUnless(ctx *tacoexec.Context, runner tacoexec.Runner, task CoreTask) (
 	return false, nil
 }
 
-func checkOnlyIfs(ctx *tacoexec.Context, runner tacoexec.Runner, task CoreTask) (isSuccess bool, err error) {
+func checkOnlyIfs(ctx *tacoexec.Context, runner tacoexec.Runner, task tasks.CoreTask) (isSuccess bool, err error) {
 	cmds := task.GetOnlyIfCmds()
 	if len(cmds) == 0 {
 		return true, nil

tasks/validate.go

@@ -5,8 +5,6 @@ import (
 	"strings"
 )
 
-const onlyIfConditionFailedReason = "only if condition was false"
-
 func ValidateRequired(val, path string) error {
 	if strings.TrimSpace(val) == "" {
 		return fmt.Errorf("empty required value at path '%s'", path)

tasks/winreg/wrtask.go

@@ -10,6 +10,7 @@ import (
 
 	tacoexec "github.com/realvnc-labs/tacoscript/exec"
 	"github.com/realvnc-labs/tacoscript/tasks"
+	"github.com/realvnc-labs/tacoscript/tasks/shared/conditionals"
 	"github.com/realvnc-labs/tacoscript/tasks/shared/executionresult"
 	"github.com/realvnc-labs/tacoscript/tasks/support/reg"
 
@@ -158,7 +159,7 @@ func (wrte *Executor) Execute(ctx context.Context, task tasks.CoreTask) executio
 	}
 
 	logrus.Debugf("will check if the task '%s' should be executed", task.GetPath())
-	skipReason, err := tasks.CheckConditionals(execCtx, wrte.FsManager, wrte.Runner, wrt)
+	skipReason, err := conditionals.Check(execCtx, wrte.FsManager, wrte.Runner, wrt)
 	if err != nil {
 		execRes.Err = err
 		return execRes