diff --git a/cmd/helm/testdata/output/schema-negative-cli.txt b/cmd/helm/testdata/output/schema-negative-cli.txt index 15652464a..aac1e2f17 100644 --- a/cmd/helm/testdata/output/schema-negative-cli.txt +++ b/cmd/helm/testdata/output/schema-negative-cli.txt @@ -1,3 +1,3 @@ -Error: .Values does not meet the specification of values.schema.yaml . see errors : +Error: values don't meet the specification of the schema: - age: Must be greater than or equal to 0/1 diff --git a/cmd/helm/testdata/output/schema-negative.txt b/cmd/helm/testdata/output/schema-negative.txt index a56ea190f..4d2376d52 100644 --- a/cmd/helm/testdata/output/schema-negative.txt +++ b/cmd/helm/testdata/output/schema-negative.txt @@ -1,4 +1,4 @@ -Error: .Values does not meet the specification of values.schema.yaml . see errors : +Error: values don't meet the specification of the schema: - (root): employmentInfo is required - age: Must be greater than or equal to 0/1 diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go index fcea4ac94..f6d98446f 100644 --- a/pkg/chartutil/values.go +++ b/pkg/chartutil/values.go @@ -170,7 +170,7 @@ func ValidateAgainstSchema(values Values, schema Schema) error { if !result.Valid() { var sb strings.Builder - sb.WriteString(".Values does not meet the specification of values.schema.yaml . see errors :\n") + sb.WriteString("values don't meet the specification of the schema:\n") for _, desc := range result.Errors() { sb.WriteString(fmt.Sprintf("- %s\n", desc)) } diff --git a/pkg/chartutil/values_test.go b/pkg/chartutil/values_test.go index ae43d796a..a73bd9049 100644 --- a/pkg/chartutil/values_test.go +++ b/pkg/chartutil/values_test.go @@ -201,8 +201,8 @@ func TestValidateAgainstSchemaNegative(t *testing.T) { errString = err.Error() } - if !strings.Contains(errString, ".Values does not meet the specification of values.schema.yaml . see errors :") { - t.Errorf("Error string does not contain expected string: \".Values does not meet the specification of values.schema.yaml . see errors :\"") + if !strings.Contains(errString, "values don't meet the specification of the schema:") { + t.Errorf("Error string does not contain expected string: \"values don't meet the specification of the schema:\"") } if !strings.Contains(errString, "- (root): employmentInfo is required") { t.Errorf("Error string does not contain expected string: \"- (root): employmentInfo is required\"")