fixing as per review

Signed-off-by: Robert Sirchia <rsirchia@outlook.com>
pull/30760/head
Robert Sirchia 5 months ago
parent 9b9ff12c6d
commit ef0361de21
No known key found for this signature in database
GPG Key ID: C2D40F4D8196E874

@ -32,7 +32,7 @@ import (
func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error { func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error {
var sb strings.Builder var sb strings.Builder
if chrt.Schema != nil { if chrt.Schema != nil {
slog.Debug("chart name", "chart-name", chrt.Name) slog.Debug("chart name", "chart-name", chrt.Name())
err := ValidateAgainstSingleSchema(values, chrt.Schema) err := ValidateAgainstSingleSchema(values, chrt.Schema)
if err != nil { if err != nil {
sb.WriteString(fmt.Sprintf("%s:\n", chrt.Name())) sb.WriteString(fmt.Sprintf("%s:\n", chrt.Name()))
@ -69,7 +69,7 @@ func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error
if err != nil { if err != nil {
return err return err
} }
slog.Debug("unmarshalled JSON schema", "schema", schema) slog.Debug("unmarshalled JSON schema", "schema", schemaJSON)
compiler := jsonschema.NewCompiler() compiler := jsonschema.NewCompiler()
err = compiler.AddResource("file:///values.schema.json", schema) err = compiler.AddResource("file:///values.schema.json", schema)
@ -81,7 +81,6 @@ func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error
if err != nil { if err != nil {
return err return err
} }
slog.Debug("validated JSON schema", "validator", validator)
err = validator.Validate(values.AsMap()) err = validator.Validate(values.AsMap())
if err != nil { if err != nil {

Loading…
Cancel
Save