Skip to content

Commit 83d9290

Browse files
committed
Enable loading of remote JSON schemas on --force flag
Signed-off-by: Matt Rutkowski <[email protected]>
1 parent f9ca245 commit 83d9290

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.vscode/launch.json

+10
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
"args": ["validate", "-i", "examples/cyclonedx/SBOM/protonmail-webclient-v4-0912dff/bom.json"],
1616
"dlvFlags": ["--check-go-version=false"]
1717
},
18+
{
19+
"showGlobalVariables": true,
20+
"name": "Debug: validate",
21+
"type": "go",
22+
"request": "launch",
23+
"mode": "debug",
24+
"program": "main.go", // "program": "${file}",
25+
"args": ["validate", "-i", "examples/cyclonedx/SBOM/protonmail-webclient-v4-0912dff/bom.json"],
26+
"dlvFlags": ["--check-go-version=false"]
27+
},
1828
{
1929
"showGlobalVariables": true,
2030
"name": "Debug: query: SELECT * FROM metadata.component",

cmd/validate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ func Validate(writer io.Writer, persistentFlags utils.PersistentCommandFlags, va
253253
return INVALID, bom, schemaErrors, errSchemaURI
254254
}
255255

256-
getLogger().Infof("Loading schema: '%s'...", schemaName)
257-
schemaLoader = gojsonschema.NewReferenceLoader(schemaName)
256+
getLogger().Infof("Loading schema: '%s'...", forcedSchemaFile)
257+
schemaLoader = gojsonschema.NewReferenceLoader(forcedSchemaFile)
258258
getLogger().Infof("Validating document using forced schema (i.e., '--force %s')", forcedSchemaFile)
259259
} else {
260260
// Load the matching JSON schema (format, version and variant) from embedded resources

0 commit comments

Comments
 (0)