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

Merge pull request #2554 from quiye/ResMap

Browse Source 
Fix length checking for ResMap resources
This commit is contained in:
Jeff Regan
2020-06-05 14:06:37 -07:00
committed by GitHub
parent 1f32e89d95 08922cfe29
commit 1c2eaa9d29
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/resmap/resmap.go
View File

@@ -532,7 +532,7 @@ func (m *resWrangler) ErrorIfNotEqualSets(other ResMap) error {
for _, r1 := range m.rList { for _, r1 := range m.rList {
id := r1.CurId() id := r1.CurId()
others := m2.GetMatchingResourcesByCurrentId(id.Equals) others := m2.GetMatchingResourcesByCurrentId(id.Equals)
if len(others) < 0 { if len(others) == 0 {
return fmt.Errorf( return fmt.Errorf(
"id in self missing from other; id: %s", id) "id in self missing from other; id: %s", id)
} }

7
api/resmap/resmap_test.go
View File

@@ -669,7 +669,12 @@ func TestErrorIfNotEqualSets(t *testing.T) {
t.Fatalf("%v should not equal %v %v", m1, m2, err) t.Fatalf("%v should not equal %v %v", m1, m2, err)
} }
m3 := resmaptest_test.NewRmBuilder(t, rf).Add( m3 := resmaptest_test.NewRmBuilder(t, rf).AddR(r2).ResMap()
if err := m2.ErrorIfNotEqualSets(m3); err == nil {
t.Fatalf("%v should not equal %v %v", m2, m3, err)
}
m3 = resmaptest_test.NewRmBuilder(t, rf).Add(
map[string]interface{}{ map[string]interface{}{
"apiVersion": "v1", "apiVersion": "v1",
"kind": "ConfigMap", "kind": "ConfigMap",