Skip to content

make json schema validation multi-error sorted #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jf-tech merged 1 commit into from
Oct 16, 2020
Merged

make json schema validation multi-error sorted #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestNewSchema(t *testing.T) {
name: "json schema validation for header failed",
schema: `{"parser_settings": {"versionx": "9999", "file_format_type": "exe" }}`,
exts: nil,
err: "schema 'test-schema' validation failed:\nparser_settings: version is required\nparser_settings: Additional property versionx is not allowed",
err: "schema 'test-schema' validation failed:\nparser_settings: Additional property versionx is not allowed\nparser_settings: version is required",
},
{
name: "no supported schema handler",
Expand Down
2 changes: 2 additions & 0 deletions validation/jsonvalidate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package validation

import (
"fmt"
"sort"
"strings"

"github.com/xeipuuv/gojsonschema"
Expand All @@ -25,6 +26,7 @@ func SchemaValidate(schemaName string, schemaContent []byte, jsonSchema string)
for _, err := range result.Errors() {
errs = append(errs, err.String())
}
sort.Strings(errs)
if len(errs) == 1 {
return fmt.Errorf("schema '%s' validation failed: %s", schemaName, errs[0])
}
Expand Down
2 changes: 1 addition & 1 deletion validation/jsonvalidate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestSchemaValidate(t *testing.T) {
"unknown": "blah"
}
}`,
expectedErr: "schema 'test-schema' validation failed:\nparser_settings: file_format_type is required\nparser_settings: Additional property unknown is not allowed",
expectedErr: "schema 'test-schema' validation failed:\nparser_settings: Additional property unknown is not allowed\nparser_settings: file_format_type is required",
},
} {
t.Run(test.name, func(t *testing.T) {
Expand Down