diff --git a/pkg/chartutil/jsonschema.go b/pkg/chartutil/jsonschema.go index 621c993e5..753dc98c1 100644 --- a/pkg/chartutil/jsonschema.go +++ b/pkg/chartutil/jsonschema.go @@ -40,9 +40,9 @@ func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) err } // For each dependency, recursively call this function with the coalesced values - for _, subchrt := range chrt.Dependencies() { - subchrtValues := values[subchrt.Name()].(map[string]interface{}) - if err := ValidateAgainstSchema(subchrt, subchrtValues); err != nil { + for _, subchart := range chrt.Dependencies() { + subchartValues := values[subchart.Name()].(map[string]interface{}) + if err := ValidateAgainstSchema(subchart, subchartValues); err != nil { sb.WriteString(err.Error()) } } diff --git a/pkg/chartutil/jsonschema_test.go b/pkg/chartutil/jsonschema_test.go index 2677ee0ea..33f009259 100644 --- a/pkg/chartutil/jsonschema_test.go +++ b/pkg/chartutil/jsonschema_test.go @@ -63,7 +63,7 @@ func TestValidateAgainstSingleSchemaNegative(t *testing.T) { } } -const subchrtSchema = `{ +const subchartSchema = `{ "$schema": "http://json-schema.org/draft-07/schema#", "title": "Values", "type": "object", @@ -81,23 +81,23 @@ const subchrtSchema = `{ ` func TestValidateAgainstSchema(t *testing.T) { - subchrtJSON := []byte(subchrtSchema) - subchrt := &chart.Chart{ + subchartJSON := []byte(subchartSchema) + subchart := &chart.Chart{ Metadata: &chart.Metadata{ - Name: "subchrt", + Name: "subchart", }, - Schema: subchrtJSON, + Schema: subchartJSON, } chrt := &chart.Chart{ Metadata: &chart.Metadata{ Name: "chrt", }, } - chrt.AddDependency(subchrt) + chrt.AddDependency(subchart) vals := map[string]interface{}{ "name": "John", - "subchrt": map[string]interface{}{ + "subchart": map[string]interface{}{ "age": 25, }, } @@ -108,23 +108,23 @@ func TestValidateAgainstSchema(t *testing.T) { } func TestValidateAgainstSchemaNegative(t *testing.T) { - subchrtJSON := []byte(subchrtSchema) - subchrt := &chart.Chart{ + subchartJSON := []byte(subchartSchema) + subchart := &chart.Chart{ Metadata: &chart.Metadata{ - Name: "subchrt", + Name: "subchart", }, - Schema: subchrtJSON, + Schema: subchartJSON, } chrt := &chart.Chart{ Metadata: &chart.Metadata{ Name: "chrt", }, } - chrt.AddDependency(subchrt) + chrt.AddDependency(subchart) vals := map[string]interface{}{ - "name": "John", - "subchrt": map[string]interface{}{}, + "name": "John", + "subchart": map[string]interface{}{}, } var errString string @@ -134,7 +134,7 @@ func TestValidateAgainstSchemaNegative(t *testing.T) { errString = err.Error() } - expectedErrString := `subchrt: + expectedErrString := `subchart: - (root): age is required ` if errString != expectedErrString {