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