spelling: subchart

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
pull/7258/head
Josh Soref 6 years ago
parent 11d5714c14
commit a1d62d0556

@ -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 each dependency, recursively call this function with the coalesced values
for _, subchrt := range chrt.Dependencies() { for _, subchart := range chrt.Dependencies() {
subchrtValues := values[subchrt.Name()].(map[string]interface{}) subchartValues := values[subchart.Name()].(map[string]interface{})
if err := ValidateAgainstSchema(subchrt, subchrtValues); err != nil { if err := ValidateAgainstSchema(subchart, subchartValues); err != nil {
sb.WriteString(err.Error()) sb.WriteString(err.Error())
} }
} }

@ -63,7 +63,7 @@ func TestValidateAgainstSingleSchemaNegative(t *testing.T) {
} }
} }
const subchrtSchema = `{ const subchartSchema = `{
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "http://json-schema.org/draft-07/schema#",
"title": "Values", "title": "Values",
"type": "object", "type": "object",
@ -81,23 +81,23 @@ const subchrtSchema = `{
` `
func TestValidateAgainstSchema(t *testing.T) { func TestValidateAgainstSchema(t *testing.T) {
subchrtJSON := []byte(subchrtSchema) subchartJSON := []byte(subchartSchema)
subchrt := &chart.Chart{ subchart := &chart.Chart{
Metadata: &chart.Metadata{ Metadata: &chart.Metadata{
Name: "subchrt", Name: "subchart",
}, },
Schema: subchrtJSON, Schema: subchartJSON,
} }
chrt := &chart.Chart{ chrt := &chart.Chart{
Metadata: &chart.Metadata{ Metadata: &chart.Metadata{
Name: "chrt", Name: "chrt",
}, },
} }
chrt.AddDependency(subchrt) chrt.AddDependency(subchart)
vals := map[string]interface{}{ vals := map[string]interface{}{
"name": "John", "name": "John",
"subchrt": map[string]interface{}{ "subchart": map[string]interface{}{
"age": 25, "age": 25,
}, },
} }
@ -108,23 +108,23 @@ func TestValidateAgainstSchema(t *testing.T) {
} }
func TestValidateAgainstSchemaNegative(t *testing.T) { func TestValidateAgainstSchemaNegative(t *testing.T) {
subchrtJSON := []byte(subchrtSchema) subchartJSON := []byte(subchartSchema)
subchrt := &chart.Chart{ subchart := &chart.Chart{
Metadata: &chart.Metadata{ Metadata: &chart.Metadata{
Name: "subchrt", Name: "subchart",
}, },
Schema: subchrtJSON, Schema: subchartJSON,
} }
chrt := &chart.Chart{ chrt := &chart.Chart{
Metadata: &chart.Metadata{ Metadata: &chart.Metadata{
Name: "chrt", Name: "chrt",
}, },
} }
chrt.AddDependency(subchrt) chrt.AddDependency(subchart)
vals := map[string]interface{}{ vals := map[string]interface{}{
"name": "John", "name": "John",
"subchrt": map[string]interface{}{}, "subchart": map[string]interface{}{},
} }
var errString string var errString string
@ -134,7 +134,7 @@ func TestValidateAgainstSchemaNegative(t *testing.T) {
errString = err.Error() errString = err.Error()
} }
expectedErrString := `subchrt: expectedErrString := `subchart:
- (root): age is required - (root): age is required
` `
if errString != expectedErrString { if errString != expectedErrString {

Loading…
Cancel
Save