kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Improve error message when namespace transformer is given invalid fieldspecs

Browse Source 
Also remove invalid+ignored fieldspecs from the defaults
This commit is contained in:
Katrina Verey
2022-07-27 19:56:24 -04:00
parent 26fcafdb57
commit 79a9154cf8
14 changed files with 148 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kyaml/yaml/fns_test.go
View File

@@ -45,7 +45,7 @@ func TestAppend(t *testing.T) {
assert.NoError(t, err)
rn, err := node.Pipe(Append(NewScalarRNode("").YNode()))
if assert.Error(t, err) {
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
}
assert.Nil(t, rn)
@@ -159,7 +159,9 @@ func TestElementSetter(t *testing.T) {
// Return error because ElementSetter will assume all elements are scalar when
// there is only value provided.
_, err = node.Pipe(ElementSetter{Values: []string{"b"}})
assert.EqualError(t, err, "wrong Node Kind for expected: ScalarNode was MappingNode: value: {a: b}")
assert.EqualError(t, err, `wrong node kind: expected ScalarNode but got MappingNode: node contents:
a: b
`)
node = MustParse(`
- a
@@ -455,7 +457,7 @@ a: b
assert.NoError(t, err)
rn, err = node.Pipe(FieldClearer{Name: "a"})
if assert.Error(t, err) {
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
}
assert.Nil(t, rn)
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
@@ -855,7 +857,9 @@ func TestMapEntrySetter(t *testing.T) {
Key: NewScalarRNode("foo"),
Value: NewScalarRNode("bar"),
},
expectedErr: errors.Errorf("wrong Node Kind for expected: MappingNode was SequenceNode: value: {- foo: baz}"),
expectedErr: errors.Errorf(`wrong node kind: expected MappingNode but got SequenceNode: node contents:
- foo: baz
`),
},
}
for _, tc := range testCases {
@@ -950,7 +954,7 @@ foo
}
k, err = instance.Filter(node)
if assert.Error(t, err) {
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
}
assert.Nil(t, k)
}
@@ -1009,7 +1013,7 @@ foo: baz
if !assert.Error(t, err) {
return
}
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
assert.Equal(t, `foo: baz
`, assertNoErrorString(t)(node.String()))
}
@@ -1029,15 +1033,15 @@ func TestErrorIfInvalid(t *testing.T) {
if !assert.Error(t, err) {
t.FailNow()
}
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
err = ErrorIfInvalid(NewRNode(&yaml.Node{}), yaml.SequenceNode)
if assert.Error(t, err) {
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
}
err = ErrorIfInvalid(NewRNode(&yaml.Node{}), yaml.MappingNode)
if assert.Error(t, err) {
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
}
err = ErrorIfInvalid(NewRNode(&yaml.Node{
@@ -1048,7 +1052,7 @@ func TestErrorIfInvalid(t *testing.T) {
err = ErrorIfInvalid(NewRNode(&yaml.Node{}), yaml.SequenceNode)
if assert.Error(t, err) {
assert.Contains(t, err.Error(), "wrong Node Kind")
assert.Contains(t, err.Error(), "wrong node kind")
}
err = ErrorIfInvalid(NewRNode(&yaml.Node{