Fixing lint issues

bmeg · Jan 30, 2024 · bf7c787 · bf7c787
1 parent cce225b
commit bf7c787
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/cmd/graph_plan/main.go → cmd/graphplan/main.go b/cmd/graph_plan/main.go → cmd/graphplan/main.go
@@ -1,4 +1,4 @@
-package graph_plan
+package graphplan
 
 import (
 	"log"

diff --git a/cmd/root.go b/cmd/root.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"os"
 
-	"github.com/bmeg/sifter/cmd/graph_plan"
+	"github.com/bmeg/sifter/cmd/graphplan"
 	"github.com/bmeg/sifter/cmd/inspect"
 	"github.com/bmeg/sifter/cmd/run"
 	"github.com/bmeg/sifter/cmd/scan"
@@ -20,7 +20,7 @@ var RootCmd = &cobra.Command{
 func init() {
 	RootCmd.AddCommand(run.Cmd)
 	RootCmd.AddCommand(inspect.Cmd)
-	RootCmd.AddCommand(graph_plan.Cmd)
+	RootCmd.AddCommand(graphplan.Cmd)
 	RootCmd.AddCommand(scan.Cmd)
 }
 

diff --git a/cmd/run/run.go b/cmd/run/run.go
@@ -21,7 +21,7 @@ func ExecuteFile(playFile string, workDir string, outDir string, inputs map[stri
 	a, _ := filepath.Abs(playFile)
 	baseDir := filepath.Dir(a)
 	log.Printf("basedir: %s", baseDir)
-	log.Printf("playbook: %s", pb)
+	log.Printf("playbook: %#v", pb)
 	return Execute(pb, baseDir, workDir, outDir, inputs)
 }
 

diff --git a/cmd/scan/main.go b/cmd/scan/main.go
@@ -17,7 +17,7 @@ var jsonOut = false
 var objectsOnly = false
 var baseDir = ""
 
-type ScanEntry struct {
+type Entry struct {
 	ObjectType string `json:"objectType"`
 	SifterFile string `json:"sifterFile"`
 	Outfile    string `json:"outFile"`
@@ -31,9 +31,9 @@ var ObjectCommand = &cobra.Command{
 
 		scanDir := args[0]
 
-		outputs := []ScanEntry{}
+		outputs := []Entry{}
 
-		ScanSifter(scanDir, func(pb *playbook.Playbook) {
+		PathWalker(scanDir, func(pb *playbook.Playbook) {
 			for pname, p := range pb.Pipelines {
 				emitName := ""
 				for _, s := range p {
@@ -46,7 +46,7 @@ var ObjectCommand = &cobra.Command{
 						outdir := pb.GetDefaultOutDir()
 						outname := fmt.Sprintf("%s.%s.%s.json.gz", pb.Name, pname, emitName)
 						outpath := filepath.Join(outdir, outname)
-						o := ScanEntry{SifterFile: pb.GetPath(), Outfile: outpath}
+						o := Entry{SifterFile: pb.GetPath(), Outfile: outpath}
 						if s.ObjectValidate != nil {
 							//outpath, _ = filepath.Rel(baseDir, outpath)
 							//fmt.Printf("%s\t%s\n", s.ObjectValidate.Title, outpath)
@@ -127,7 +127,7 @@ var ScriptCommand = &cobra.Command{
 
 		userInputs := map[string]string{}
 
-		ScanSifter(scanDir, func(pb *playbook.Playbook) {
+		PathWalker(scanDir, func(pb *playbook.Playbook) {
 			path := pb.GetPath()
 			scriptDir := filepath.Dir(path)
 
@@ -203,7 +203,7 @@ func init() {
 
 }
 
-func ScanSifter(baseDir string, userFunc func(*playbook.Playbook)) {
+func PathWalker(baseDir string, userFunc func(*playbook.Playbook)) {
 	filepath.Walk(baseDir,
 		func(path string, info fs.FileInfo, err error) error {
 			if strings.HasSuffix(path, ".yaml") {

diff --git a/task/task.go b/task/task.go
@@ -107,10 +107,10 @@ func (m *Task) BaseDir() string {
 
 func (m *Task) Emit(n string, e map[string]interface{}, useName bool) error {
 
-	new_name := m.GetName() + "." + n
+	newName := m.GetName() + "." + n
 	if useName {
 		temp := strings.Split(n, ".")
-		new_name = temp[len(temp)-1]
+		newName = temp[len(temp)-1]
 	}
-	return m.Emitter.Emit(new_name, e, useName)
+	return m.Emitter.Emit(newName, e, useName)
 }
diff --git a/transform/object_validate.go b/transform/object_validate.go
@@ -10,7 +10,7 @@ import (
 	"github.com/bmeg/sifter/evaluate"
 	"github.com/bmeg/sifter/task"
 	"github.com/santhosh-tekuri/jsonschema/v5"
-	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
+	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader" // setup the httploader for the jsonschema checker
 )
 
 type ObjectValidateStep struct {