Merge pull request #65 from jennybuckley/fix-remove-node

Fix bug with removing non leaf items

Author: k8s-ci-robot

fieldpath/set.go

@@ -159,7 +159,10 @@ func (s *Set) iteratePrefix(prefix Path, f func(Path)) {
 func (s *Set) WithPrefix(pe PathElement) *Set {
 	subset, ok := s.Children.Get(pe)
 	if !ok {
-		return NewSet()
+		subset = NewSet()
+	}
+	if s.Members.Has(pe) {
+		subset.Insert(MakePathOrDie(""))
 	}
 	return subset
 }

merge/key_test.go

@@ -0,0 +1,105 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+ 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ 
+    http://www.apache.org/licenses/LICENSE-2.0
+ 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+ 
+package merge_test
+ 
+import (
+	"testing"
+ 
+	"sigs.k8s.io/structured-merge-diff/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/typed"
+)
+ 
+var associativeListParser = func() typed.ParseableType {
+	parser, err := typed.NewParser(`types:
+- name: type
+  struct:
+    fields:
+      - name: list
+        type:
+          namedType: associativeList
+- name: associativeList
+  list:
+    elementType:
+      namedType: myElement
+    elementRelationship: associative
+    keys:
+    - name
+- name: myElement
+  struct:
+    fields:
+    - name: name
+      type:
+        scalar: string
+    - name: value
+      type:
+        scalar: numeric
+`)
+	if err != nil {
+		panic(err)
+	}
+	return parser.Type("type")
+}()
+ 
+func TestUpdateAssociativeLists(t *testing.T) {
+	tests := map[string]TestCase{
+		"removing_obsolete_applied_structs": {
+			Ops: []Operation{
+				Apply{
+					Manager: "default",
+					Object: `
+						list:
+						- name: a
+						  value: 1
+					`,
+					APIVersion: "v1",
+				},
+				Apply{
+					Manager: "default",
+					Object: `
+						list:
+						- name: b
+						  value: 2
+					`,
+					APIVersion: "v1",
+				},
+			},
+			Object: `
+				list:
+				- name: b
+				  value: 2
+			`,
+			Managed: fieldpath.ManagedFields{
+				"default": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("list", _KBF("name", _SV("b")), "name"),
+						_P("list", _KBF("name", _SV("b")), "value"),
+					),
+					APIVersion: "v1",
+				},
+			},
+		},
+	}
+ 
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			if err := test.Test(associativeListParser); err != nil {
+				t.Fatal(err)
+			}
+		})
+	}
+}