Merge pull request #7 from cloudradar-monitoring/DEV-2369

fix file.managed
realvnc-labs · Nov 2, 2021 · fede347 · fede347
2 parents 4b653a3 + df2561f
commit fede347
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/script/scriptResult.go b/script/scriptResult.go
@@ -16,6 +16,7 @@ type taskResult struct {
 	Name     string `yaml:"Name"`
 	Result   bool   `yaml:"Result"`
 	Comment  string `yaml:"Comment,omitempty"`
+	Error    string `yaml:"Error,omitempty"`
 
 	Started  onlyTime      `yaml:"Started"`
 	Duration time.Duration `yaml:"Duration"`
@@ -24,13 +25,13 @@ type taskResult struct {
 }
 
 type scriptSummary struct {
-	Config            string        `yaml:"Config"`
-	Succeeded         int           `yaml:"Succeeded"`
-	Failed            int           `yaml:"Failed"`
-	Aborted           int           `yaml:"Aborted"`
-	Changes           int           `yaml:"Changes"`
-	TotalFunctionsRun int           `yaml:"TotalFunctionsRun"`
-	TotalRunTime      time.Duration `yaml:"TotalRunTime"`
+	Script        string        `yaml:"Script"`
+	Succeeded     int           `yaml:"Succeeded"`
+	Failed        int           `yaml:"Failed"`
+	Aborted       int           `yaml:"Aborted"`
+	Changes       int           `yaml:"Changes"`
+	TotalTasksRun int           `yaml:"TotalTasksRun"`
+	TotalRunTime  time.Duration `yaml:"TotalRunTime"`
 }
 
 const stampMicro = "15:04:05.000000"

diff --git a/script/scriptRunner.go b/script/scriptRunner.go
@@ -89,6 +89,10 @@ func (r Runner) Run(ctx context.Context, scripts tasks.Scripts, globalAbortOnErr
 				}
 			}
 
+			errString := ""
+			if res.Err != nil {
+				errString = res.Err.Error()
+			}
 			result.Results = append(result.Results, taskResult{
 				ID:       script.ID,
 				Function: task.GetName(),
@@ -98,6 +102,7 @@ func (r Runner) Run(ctx context.Context, scripts tasks.Scripts, globalAbortOnErr
 				Started:  onlyTime(taskStart),
 				Duration: res.Duration,
 				Changes:  changeMap,
+				Error:    errString,
 			})
 		}
 
@@ -110,13 +115,13 @@ func (r Runner) Run(ctx context.Context, scripts tasks.Scripts, globalAbortOnErr
 	}
 
 	result.Summary = scriptSummary{
-		Config:            r.DataProvider.Path,
-		Succeeded:         succeeded,
-		Failed:            failed,
-		Aborted:           aborted,
-		Changes:           changes,
-		TotalFunctionsRun: tasksRun,
-		TotalRunTime:      time.Since(scriptStart),
+		Script:        r.DataProvider.Path,
+		Succeeded:     succeeded,
+		Failed:        failed,
+		Aborted:       aborted,
+		Changes:       changes,
+		TotalTasksRun: tasksRun,
+		TotalRunTime:  time.Since(scriptStart),
 	}
 
 	y, err := yaml.Marshal(result)

diff --git a/tasks/fileManagedTask.go b/tasks/fileManagedTask.go
@@ -207,6 +207,8 @@ func (fmte *FileManagedTaskExecutor) Execute(ctx context.Context, task Task) Exe
 		return execRes
 	}
 
+	execRes.Name = fileManagedTask.Name
+
 	var stdoutBuf, stderrBuf bytes.Buffer
 	execCtx := &exec2.Context{
 		Ctx:          ctx,
@@ -366,6 +368,7 @@ func (fmte *FileManagedTaskExecutor) checkMissingFileCondition(
 	fileManagedTask *FileManagedTask,
 ) (isExists bool, fileName string, err error) {
 	if len(fileManagedTask.Creates) == 0 {
+		fileName = fileManagedTask.Name
 		return
 	}
 

diff --git a/utils/osFilesWin.go b/utils/osFilesWin.go
@@ -4,10 +4,9 @@
 package utils
 
 import (
+	"fmt"
 	"os"
 	"strings"
-
-	log "github.com/sirupsen/logrus"
 )
 
 func ParseLocationOS(rawLocation string) string {
@@ -22,7 +21,5 @@ func ParseLocationOS(rawLocation string) string {
 }
 
 func Chown(targetFilePath, userName, groupName string) error {
-	log.Debug("no chown support under windows")
-
-	return nil
+	return fmt.Errorf("no chown support under windows")
 }