Invalid JSON should not be considered an error - see #67 (#327)

yannh · web-flow · commit a23275d5ca05 · 2025-05-12T10:21:02.000+02:00
diff --git a/pkg/loader/http.go b/pkg/loader/http.go
@@ -56,7 +56,7 @@ func (l *HTTPURLLoader) Load(url string) (any, error) {
 
 	s, err := jsonschema.UnmarshalJSON(bytes.NewReader(body))
 	if err != nil {
-		return nil, err
+		return nil, NewNonJSONResponseError(err)
 	}
 
 	return s, nil
diff --git a/pkg/loader/loaders.go b/pkg/loader/loaders.go
@@ -10,3 +10,13 @@ func NewNotFoundError(err error) *NotFoundError {
 }
 func (e *NotFoundError) Error() string   { return e.err.Error() }
 func (e *NotFoundError) Retryable() bool { return false }
+
+type NonJSONResponseError struct {
+	err error
+}
+
+func NewNonJSONResponseError(err error) *NotFoundError {
+	return &NotFoundError{err}
+}
+func (e *NonJSONResponseError) Error() string   { return e.err.Error() }
+func (e *NonJSONResponseError) Retryable() bool { return false }
diff --git a/pkg/validator/validator.go b/pkg/validator/validator.go
@@ -309,6 +309,10 @@ func downloadSchema(registries []registry.Registry, l jsonschema.SchemeURLLoader
 		if _, notfound := err.(*loader.NotFoundError); notfound {
 			continue
 		}
+		if _, nonJSONError := err.(*loader.NonJSONResponseError); nonJSONError {
+			continue
+		}
+
 		return nil, err
 	}
 
diff --git a/pkg/validator/validator_test.go b/pkg/validator/validator_test.go
@@ -316,7 +316,7 @@ lastName: bar
 }`),
 			false,
 			false,
-			Error,
+			Valid,
 			[]ValidationError{},
 		},
 		{
@@ -361,7 +361,7 @@ lastName: bar
 			[]byte(`<html>error page</html>`),
 			true,
 			false,
-			Error,
+			Skipped,
 			[]ValidationError{},
 		},
 		{
@@ -394,13 +394,19 @@ lastName: bar
 						return "", nil, loader.NewNotFoundError(nil)
 					}
 					s, err := jsonschema.UnmarshalJSON(bytes.NewReader(testCase.schemaRegistry1))
+					if err != nil {
+						return "", s, loader.NewNonJSONResponseError(err)
+					}
 					return "", s, err
 				}),
 				newMockRegistry(func() (string, any, error) {
 					if testCase.schemaRegistry2 == nil {
 						return "", nil, loader.NewNotFoundError(nil)
 					}
 					s, err := jsonschema.UnmarshalJSON(bytes.NewReader(testCase.schemaRegistry2))
+					if err != nil {
+						return "", s, loader.NewNonJSONResponseError(err)
+					}
 					return "", s, err
 				}),
 			},
@@ -469,6 +475,9 @@ age: not a number
 		regs: []registry.Registry{
 			newMockRegistry(func() (string, any, error) {
 				s, err := jsonschema.UnmarshalJSON(bytes.NewReader(schema))
+				if err != nil {
+					return "", s, loader.NewNonJSONResponseError(err)
+				}
 				return "", s, err
 			}),
 		},

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (l *HTTPURLLoader) Load(url string) (any, error) {`
`56`	`56`
`57`	`57`	`s, err := jsonschema.UnmarshalJSON(bytes.NewReader(body))`
`58`	`58`	`if err != nil {`
`59`		`- return nil, err`
	`59`	`+ return nil, NewNonJSONResponseError(err)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return s, nil`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,10 @@ func downloadSchema(registries []registry.Registry, l jsonschema.SchemeURLLoader`
`309`	`309`	`if _, notfound := err.(*loader.NotFoundError); notfound {`
`310`	`310`	`continue`
`311`	`311`	`}`
	`312`	`+ if _, nonJSONError := err.(*loader.NonJSONResponseError); nonJSONError {`
	`313`	`+ continue`
	`314`	`+ }`
	`315`	`+`
`312`	`316`	`return nil, err`
`313`	`317`	`}`
`314`	`318`