diff --git a/pkg/output/json.go b/pkg/output/json.go index 5090a9e..7d04a71 100644 --- a/pkg/output/json.go +++ b/pkg/output/json.go @@ -36,19 +36,20 @@ func (o *JSONOutput) Write(filename, kind, version string, err error, skipped bo msg, st := "", "" s := status(err, skipped) - switch { - case s == VALID: + + switch s { + case VALID: st = "VALID" o.nValid++ - case s == INVALID: + case INVALID: st = "INVALID" msg = err.Error() o.nInvalid++ - case s == ERROR: + case ERROR: st = "ERROR" msg = err.Error() o.nErrors++ - case s == SKIPPED: + case SKIPPED: st = "SKIPPED" o.nSkipped++ } diff --git a/pkg/output/text.go b/pkg/output/text.go index 2fbe226..d3e660a 100644 --- a/pkg/output/text.go +++ b/pkg/output/text.go @@ -27,20 +27,19 @@ func (o *TextOutput) Write(filename, kind, version string, err error, skipped bo o.Lock() defer o.Unlock() - s := status(err, skipped) - switch { - case s == VALID: + switch status(err, skipped) { + case VALID: if !o.quiet { fmt.Printf("%s - %s is valid\n", filename, kind) } o.nValid++ - case s == INVALID: + case INVALID: fmt.Printf("%s - %s is invalid: %s\n", filename, kind, err) o.nInvalid++ - case s == ERROR: + case ERROR: fmt.Printf("%s - %s failed validation: %s\n", filename, kind, err) o.nErrors++ - case s == SKIPPED: + case SKIPPED: if !o.quiet { fmt.Printf("%s - %s skipped\n", filename, kind) }