fix: print only important errors

evilmartians · Jan 10, 2025 · 8308a9b · 8308a9b
1 parent a78a3aa
commit 8308a9b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 22 deletions.
diff --git a/internal/config/script.go b/internal/config/script.go
@@ -10,7 +10,7 @@ type Script struct {
 
 	Skip     interface{}       `json:"skip,omitempty"     jsonschema:"oneof_type=boolean;array" mapstructure:"skip"       toml:"skip,omitempty,inline" yaml:",omitempty"`
 	Only     interface{}       `json:"only,omitempty"     jsonschema:"oneof_type=boolean;array" mapstructure:"only"       toml:"only,omitempty,inline" yaml:",omitempty"`
-	Tags     []string          `json:"tags,omitempty"     mapstructure:"tags"                   toml:"tags,omitempty"     yaml:",omitempty"`
+	Tags     []string          `json:"tags,omitempty"     jsonschema:"oneof_type=string;array"  mapstructure:"tags"       toml:"tags,omitempty"        yaml:",omitempty"`
 	Env      map[string]string `json:"env,omitempty"      mapstructure:"env"                    toml:"env,omitempty"      yaml:",omitempty"`
 	Priority int               `json:"priority,omitempty" mapstructure:"priority"               toml:"priority,omitempty" yaml:",omitempty"`
 

diff --git a/internal/lefthook/validate.go b/internal/lefthook/validate.go
@@ -36,47 +36,56 @@ func Validate(opts *Options) error {
 		details := result.ToList()
 		logValidationErrors(0, *details)
 
-		return errors.New("Validation failed: main config")
+		return errors.New("Validation failed for main config")
 	}
 
 	result = schema.Validate(secondary.Raw())
 	if !result.IsValid() {
 		details := result.ToList()
 		logValidationErrors(0, *details)
 
-		return errors.New("Validation failed: secondary config")
+		return errors.New("Validation failed for secondary config")
 	}
 
 	log.Info("All good")
 	return nil
 }
 
 func logValidationErrors(indent int, details jsonschema.List) {
-	if len(details.Details) == 0 && details.Valid {
+	if details.Valid {
 		return
 	}
 
 	if len(details.InstanceLocation) > 0 {
-		var errors []string
-		if len(details.Errors) > 0 {
-			for key, value := range details.Errors {
-				errors = append(errors, "["+key+"] "+value)
-			}
-		}
-
-		key := strings.Repeat(" ", indent) + strings.ReplaceAll(details.InstanceLocation, "/", "") + ":"
-
-		if len(errors) == 0 {
-			key = log.Gray(key)
-		} else {
-			key = log.Yellow(key)
-		}
+		logDetail(indent, details)
 
-		log.Info(key, log.Red(strings.Join(errors, ",")))
 		indent += 2
 	}
 
 	for _, d := range details.Details {
 		logValidationErrors(indent, d)
 	}
 }
+
+func logDetail(indent int, details jsonschema.List) {
+	var errors []string
+	if len(details.Errors) > 0 {
+		for _, err := range details.Errors {
+			errors = append(errors, err)
+		}
+	}
+
+	option := strings.Repeat(" ", indent) + strings.TrimLeft(details.InstanceLocation, "/") + ":"
+
+	if len(errors) == 0 {
+		option = log.Gray(option)
+	} else {
+		option = log.Yellow(option)
+	}
+
+	if len(details.Details) > 0 {
+		log.Info(option)
+	} else {
+		log.Info(option, log.Red(strings.Join(errors, ",")))
+	}
+}
diff --git a/schema.json b/schema.json
@@ -354,10 +354,17 @@
           ]
         },
         "tags": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array"
+            }
+          ],
           "items": {
             "type": "string"
-          },
-          "type": "array"
+          }
         },
         "env": {
           "additionalProperties": {
@@ -385,7 +392,7 @@
       "type": "object"
     }
   },
-  "$comment": "Last updated on 2025.01.09.",
+  "$comment": "Last updated on 2025.01.10.",
   "properties": {
     "min_version": {
       "type": "string",