Merge pull request #70 from jennybuckley/fix-removal

 Implement list item and map key removal for multiple appliers

Author: k8s-ci-robot

fieldpath/managers.go

@@ -20,6 +20,7 @@ type APIVersion string
 type VersionedSet struct {
 	*Set
 	APIVersion APIVersion
+	Applied    bool
 }
 
 // ManagedFields is a map from manager to VersionedSet (what they own in

fieldpath/set.go

@@ -80,7 +80,6 @@ func (s *Set) Intersection(s2 *Set) *Set {
 // Difference returns a Set containing elements which:
 // * appear in s
 // * do not appear in s2
-// * and are not children of elements that appear in s2.
 //
 // In other words, for leaf fields, this acts like a regular set difference
 // operation. When non leaf fields are compared with leaf fields ("parents"
@@ -159,10 +158,7 @@ func (s *Set) iteratePrefix(prefix Path, f func(Path)) {
 func (s *Set) WithPrefix(pe PathElement) *Set {
 	subset, ok := s.Children.Get(pe)
 	if !ok {
-		subset = NewSet()
-	}
-	if s.Members.Has(pe) {
-		subset.Insert(MakePathOrDie(""))
+		return NewSet()
 	}
 	return subset
 }
@@ -287,9 +283,6 @@ func (s *SetNodeMap) Difference(s2 *Set) *SetNodeMap {
 	out := &SetNodeMap{}
 	for k, sn := range s.members {
 		pe := sn.pathElement
-		if s2.Members.Has(pe) {
-			continue
-		}
 		if sn2, ok := s2.Children.members[k]; ok {
 			diff := *sn.set.Difference(sn2.set)
 			// We aren't permitted to add nodes with no elements.

fieldpath/set_test.go

@@ -292,6 +292,7 @@ func TestSetIntersectionDifference(t *testing.T) {
 			MakePathOrDie("foo", 0),
 			MakePathOrDie("b0", nameFirst),
 			MakePathOrDie("bar", "c0"),
+			MakePathOrDie("cp", nameFirst, "child"),
 		)
 
 		got := s1.Difference(s2)

internal/fixture/state.go

@@ -88,6 +88,10 @@ func (s *State) Update(obj typed.YAMLObject, version fieldpath.APIVersion, manag
 		return err
 	}
 	tv, err := s.Parser.FromYAML(obj)
+	s.Live , err = s.Updater.Converter.Convert(s.Live, version)
+	if err != nil {
+		return err
+	}
 	managers, err := s.Updater.Update(s.Live, tv, version, s.Managers, manager)
 	if err != nil {
 		return err
@@ -108,6 +112,10 @@ func (s *State) Apply(obj typed.YAMLObject, version fieldpath.APIVersion, manage
 	if err != nil {
 		return err
 	}
+	s.Live , err = s.Updater.Converter.Convert(s.Live, version)
+	if err != nil {
+		return err
+	}
 	new, managers, err := s.Updater.Apply(s.Live, tv, version, s.Managers, manager, force)
 	if err != nil {
 		return err
@@ -135,6 +143,8 @@ func (s *State) CompareLive(obj typed.YAMLObject) (*typed.Comparison, error) {
 // dummyConverter doesn't convert, it just returns the same exact object, as long as a version is provided.
 type dummyConverter struct{}
 
+var _ merge.Converter = dummyConverter{}
+
 // Convert returns the object given in input, not doing any conversion.
 func (dummyConverter) Convert(v typed.TypedValue, version fieldpath.APIVersion) (typed.TypedValue, error) {
 	if len(version) == 0 {
@@ -187,7 +197,7 @@ var _ Operation = &Apply{}
 func (a Apply) run(state *State) error {
 	err := state.Apply(a.Object, a.APIVersion, a.Manager, false)
 	if err != nil {
-		if _, ok := err.(merge.Conflicts); !ok {
+		if _, ok := err.(merge.Conflicts); !ok || a.Conflicts == nil {
 			return err
 		}
 	}
@@ -254,10 +264,15 @@ type TestCase struct {
 	Managed fieldpath.ManagedFields
 }
 
-// Test runs the test-case using the given parser.
+// Test runs the test-case using the given parser and a dummy converter.
 func (tc TestCase) Test(parser typed.ParseableType) error {
+	return tc.TestWithConverter(parser, &dummyConverter{})
+}
+
+// TestWithConverter runs the test-case using the given parser and converter.
+func (tc TestCase) TestWithConverter(parser typed.ParseableType, converter merge.Converter) error {
 	state := State{
-		Updater: &merge.Updater{Converter: &dummyConverter{}},
+		Updater: &merge.Updater{Converter: converter},
 		Parser:  parser,
 	}
 	// We currently don't have any test that converts, we can take

merge/key_test.go

@@ -86,6 +86,7 @@ func TestUpdateAssociativeLists(t *testing.T) {
 			Managed: fieldpath.ManagedFields{
 				"default": &fieldpath.VersionedSet{
 					Set: _NS(
+						_P("list", _KBF("name", _SV("b"))),
 						_P("list", _KBF("name", _SV("b")), "name"),
 						_P("list", _KBF("name", _SV("b")), "value"),
 					),