Moved file loading logic in a package

Author: iv-p

cmd/check.go

@@ -1,15 +1,9 @@
 package cmd
 
 import (
-	"errors"
-	"os"
-	"path/filepath"
-
-	"github.com/getapid/apid/env"
+	"github.com/getapid/apid/file"
 	"github.com/getapid/apid/http"
-	"github.com/getapid/apid/log"
 	"github.com/getapid/apid/spec"
-	"github.com/getapid/apid/spec/loader"
 	"github.com/getapid/apid/spec/runner"
 	"github.com/getapid/apid/step"
 	"github.com/getapid/apid/writer"
@@ -21,8 +15,6 @@ var (
 	parallelism int
 	json        bool
 	silent      bool
-
-	ErrTestFailedError = errors.New("tests_failed")
 )
 
 var checkCmd = &cobra.Command{
@@ -46,60 +38,16 @@ func init() {
 	checkCmd.Flags().BoolVar(&silent, "silent", false, "set output mode to silent only printing the end result of the tests")
 }
 
-const (
-	ExitCodeOK int = 0
-
-	ExitCodeErrTestFailure       int = 1
-	ExitCodeErrReadingSpec       int = 100
-	ExitCodeErrInvalidSpecFormat int = 101
-)
-
 func check(cmd *cobra.Command, args []string) error {
-	files, err := filepath.Glob(specPattern)
-	if err != nil {
-		log.L.Errorf("error finding files: %s", err)
-	}
-
-	if len(files) == 0 {
-		log.L.Fatalf("no files found matching pattern: %s", specPattern)
-	}
-
-	var specLoader loader.JsonnetLoader
-	hasError := false
-
-	specs := make(map[string]spec.Spec)
-	for _, file := range files {
-		jsonSpecs, err := specLoader.Load(file, env.LoadVars())
-		if err != nil {
-			os.Exit(ExitCodeErrReadingSpec)
-		}
-		for name, jsonSpec := range jsonSpecs {
-			spec, err := spec.Unmarshal([]byte(jsonSpec))
-			hasError = hasError || err != nil
-
-			if _, ok := specs[name]; ok {
-				log.L.Fatalf("duplicate spec with name %s", name)
-			}
-
-			if len(spec.Name) == 0 {
-				spec.Name = name
-			}
-
-			specs[name] = spec
-		}
-	}
-
-	if hasError {
-		os.Exit(ExitCodeErrInvalidSpecFormat)
-	}
+	specLoader := spec.NewSpecLoader(file.JsonnetReader{})
+	specs := specLoader.Load(specPattern)
 
 	var w writer.Writer
 	if json {
 		w = writer.NewJSON(cmd.OutOrStdout())
 	} else {
 		w = writer.NewConsole(cmd.OutOrStdout(), silent)
 	}
-	w.Prelude()
 
 	httpClient := http.NewClient()
 	stepHttpClient := step.NewHTTPClient(httpClient)
@@ -108,6 +56,9 @@ func check(cmd *cobra.Command, args []string) error {
 	stepExporter := step.NewExporter()
 	stepRunner := step.NewRunner(stepHttpClient, *stepInterpolator, stepValidator, stepExporter)
 	specRunner := runner.NewParallelSpecRunner(parallelism, stepRunner, w)
+
+	w.Prelude()
+
 	specRunner.Run(specs)
 
 	w.Conclusion()

spec/loader/jsonnet_loader.go file/jsonnet_reader.gospec/loader/jsonnet_loader.go renamed to file/jsonnet_reader.go

@@ -1,4 +1,4 @@
-package loader
+package file
 
 import (
 	"fmt"
@@ -10,13 +10,13 @@ import (
 	"github.com/google/go-jsonnet"
 )
 
-type Loader interface {
-	Load(file string, environment env.Vars) (map[string]string, error)
+type Reader interface {
+	Load(file string, environment env.Vars) map[string]string
 }
 
-type JsonnetLoader struct{}
+type JsonnetReader struct{}
 
-func (l JsonnetLoader) Load(path string, environment env.Vars) (map[string]string, error) {
+func (l JsonnetReader) Load(path string, environment env.Vars) map[string]string {
 	vm := jsonnet.MakeVM()
 	vm.StringOutput = true
 
@@ -29,13 +29,13 @@ func (l JsonnetLoader) Load(path string, environment env.Vars) (map[string]strin
 
 	specs, err := vm.EvaluateFileMulti(path)
 	if err != nil {
-		log.L.Errorf("error loading %s: %s", path, err)
+		log.L.Fatalf("error loading %s: %s", path, err)
 	}
 
 	result := make(map[string]string, len(specs))
 	for name, spec := range specs {
 		result[fmt.Sprintf("%s::%s", filename, name)] = spec
 	}
 
-	return result, err
+	return result
 }

spec/loader.go

@@ -0,0 +1,70 @@
+package spec
+
+import (
+	"errors"
+	"path/filepath"
+
+	"github.com/getapid/apid/env"
+	"github.com/getapid/apid/file"
+	"github.com/getapid/apid/log"
+)
+
+var (
+	ErrNoFilesFound error = errors.New("no_files_found")
+	ErrInvalidSpec  error = errors.New("invalid_spec_format")
+)
+
+type Loader interface {
+	Load(string) []Spec
+}
+
+type specLoader struct {
+	filereader file.Reader
+}
+
+func NewSpecLoader(filereader file.Reader) Loader {
+	return &specLoader{filereader: filereader}
+}
+
+func (r specLoader) Load(glob string) []Spec {
+	files, err := filepath.Glob(glob)
+	if err != nil {
+		log.L.Errorf("error finding files: %s", err)
+	}
+
+	if len(files) == 0 {
+		log.L.Fatalf("no files found matching pattern: %s", glob)
+	}
+
+	hasError := false
+
+	specs := make(map[string]Spec)
+	for _, file := range files {
+		jsonSpecs := r.filereader.Load(file, env.LoadVars())
+		for name, jsonSpec := range jsonSpecs {
+			spec, err := Unmarshal([]byte(jsonSpec))
+			hasError = hasError || err != nil
+
+			if _, ok := specs[name]; ok {
+				log.L.Fatalf("duplicate spec with name %s", name)
+			}
+
+			if len(spec.Name) == 0 {
+				spec.Name = name
+			}
+
+			specs[name] = spec
+		}
+	}
+
+	var result []Spec
+	for _, spec := range specs {
+		result = append(result, spec)
+	}
+
+	if hasError {
+		log.L.Fatalf("error parsing specs")
+	}
+
+	return result
+}

spec/runner/spec_runner.go

@@ -34,10 +34,10 @@ func NewParallelSpecRunner(parallelism int, runner step.Runner, writer writer.Wr
 	}
 }
 
-func (r *ParallelSpecRunner) Run(specs map[string]spec.Spec) bool {
+func (r *ParallelSpecRunner) Run(specs []spec.Spec) bool {
 	var jobs []job
-	for name, spec := range specs {
-		jobs = append(jobs, job{name: name, spec: spec})
+	for _, spec := range specs {
+		jobs = append(jobs, job{name: spec.Name, spec: spec})
 	}
 	jobsChan := make(chan job)
 	resultsChan := make(chan writer.Result)