Skip to content
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

Jump to bottom

surface any errors encountered during schema validation #672

Merged
merged 2 commits into from
Mar 2, 2023
Merged

surface any errors encountered during schema validation #672

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8023638
surface any errors encountered during schema validation
sudermanjr Mar 1, 2023
0e7f75e
Merge branch 'master' into sudermanjr/surface-json-marshal-errors-in-…
sudermanjr Mar 1, 2023
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
6 changes: 3 additions & 3 deletions pkg/course/course.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ func OpenCourseFile(fileName string, schema []byte) (*FileV2, error) {

if err := courseFile.validateJsonSchema(schema); err != nil {
klog.V(3).Infof("failed to validate jsonSchema in course file: %s", fileName)
return nil, SchemaValidationError
return nil, err
}

return courseFile, nil
Expand Down Expand Up @@ -562,12 +562,12 @@ func (f *FileV2) validateJsonSchema(schemaData []byte) error {

jsonData, err := json.Marshal(f)
if err != nil {
return SchemaValidationError
return err
}

result, err := schema.Validate(gojsonschema.NewBytesLoader(jsonData))
if err != nil {
return SchemaValidationError
return err
}
if len(result.Errors()) > 0 {
for _, err := range result.Errors() {
Expand Down