Implement TypedValue for deducedTypedValue

Create a new deducedTypedValue that doesn't have a schema, and implement
the TypedValue interface for it. This also adds tests for each of the
methods, and moved the broken top-level test to working top-level tests
since most of them have been magically fixed by this change. Some of the
tests didn't make sense (assuming lists are not atomic) and thus have
been removed.

Author: Antoine Pelisse

fieldpath/path.go

@@ -35,6 +35,12 @@ func (fp Path) String() string {
 	return strings.Join(strs, "")
 }
 
+func (fp Path) Copy() Path {
+	new := make(Path, len(fp))
+	copy(new, fp)
+	return new
+}
+
 // MakePath constructs a Path. The parts may be PathElements, ints, strings.
 func MakePath(parts ...interface{}) (Path, error) {
 	var fp Path

merge/deduced_test.go

@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/structured-merge-diff/typed"
 )
 
-func TestDeducedTypesBroken(t *testing.T) {
+func TestDeduced(t *testing.T) {
 	tests := map[string]TestCase{
 		"leaf_apply_twice": {
 			Ops: []Operation{
@@ -230,28 +230,7 @@ func TestDeducedTypesBroken(t *testing.T) {
 				},
 			},
 		},
-		"leaf_apply_remove_empty_set": {
-			Ops: []Operation{
-				Apply{
-					Manager:    "default",
-					APIVersion: "v1",
-					Object: `
-						string: "string"
-					`,
-				},
-				Apply{
-					Manager:    "default",
-					APIVersion: "v1",
-					Object:     "",
-				},
-			},
-			Object: `
-				string: "string"
-			`,
-			Managed: fieldpath.ManagedFields{},
-		},
-
-		"apply_twice": {
+		"apply_twice_list_is_atomic": {
 			Ops: []Operation{
 				Apply{
 					Manager:    "default",
@@ -268,94 +247,27 @@ func TestDeducedTypesBroken(t *testing.T) {
 					Object: `
 						list:
 						- a
-						- b
-						- c
 						- d
-					`,
-				},
-			},
-			Object: `
-				list:
-				- a
-				- b
-				- c
-				- d
-			`,
-			Managed: fieldpath.ManagedFields{
-				"default": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("a")),
-						_P("list", _SV("b")),
-						_P("list", _SV("c")),
-						_P("list", _SV("d")),
-					),
-					APIVersion: "v1",
-				},
-			},
-		},
-		"apply_update_apply_no_overlap": {
-			Ops: []Operation{
-				Apply{
-					Manager:    "default",
-					APIVersion: "v1",
-					Object: `
-						list:
-						- a
 						- c
-					`,
-				},
-				Update{
-					Manager:    "controller",
-					APIVersion: "v1",
-					Object: `
-						list:
-						- a
 						- b
-						- c
-						- d
-					`,
-				},
-				Apply{
-					Manager:    "default",
-					APIVersion: "v1",
-					Object: `
-						list:
-						- a
-						- aprime
-						- c
-						- cprime
 					`,
 				},
 			},
 			Object: `
 				list:
 				- a
-				- aprime
-				- b
-				- c
-				- cprime
 				- d
+				- c
+				- b
 			`,
 			Managed: fieldpath.ManagedFields{
 				"default": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("a")),
-						_P("list", _SV("aprime")),
-						_P("list", _SV("c")),
-						_P("list", _SV("cprime")),
-					),
-					APIVersion: "v1",
-				},
-				"controller": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("b")),
-						_P("list", _SV("d")),
-					),
+					Set:        _NS(_P("list")),
 					APIVersion: "v1",
 				},
 			},
 		},
-		"apply_update_apply_with_overlap": {
+		"apply_update_apply_list": {
 			Ops: []Operation{
 				Apply{
 					Manager:    "default",
@@ -377,7 +289,7 @@ func TestDeducedTypesBroken(t *testing.T) {
 						- d
 					`,
 				},
-				Apply{
+				ForceApply{
 					Manager:    "default",
 					APIVersion: "v1",
 					Object: `
@@ -393,131 +305,40 @@ func TestDeducedTypesBroken(t *testing.T) {
 				- a
 				- b
 				- c
-				- d
 			`,
 			Managed: fieldpath.ManagedFields{
 				"default": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("a")),
-						_P("list", _SV("b")),
-						_P("list", _SV("c")),
-					),
-					APIVersion: "v1",
-				},
-				"controller": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("b")),
-						_P("list", _SV("d")),
-					),
-					APIVersion: "v1",
-				},
-			},
-		},
-		"apply_twice_reorder": {
-			Ops: []Operation{
-				Apply{
-					Manager:    "default",
-					APIVersion: "v1",
-					Object: `
-						list:
-						- a
-						- b
-						- c
-						- d
-					`,
-				},
-				Apply{
-					Manager:    "default",
-					APIVersion: "v1",
-					Object: `
-						list:
-						- a
-						- d
-						- c
-						- b
-					`,
-				},
-			},
-			Object: `
-				list:
-				- a
-				- d
-				- c
-				- b
-			`,
-			Managed: fieldpath.ManagedFields{
-				"default": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("a")),
-						_P("list", _SV("b")),
-						_P("list", _SV("c")),
-						_P("list", _SV("d")),
-					),
+					Set:        _NS(_P("list")),
 					APIVersion: "v1",
 				},
 			},
 		},
-		"apply_update_apply_reorder": {
+		"leaf_apply_remove_empty_set": {
 			Ops: []Operation{
 				Apply{
 					Manager:    "default",
 					APIVersion: "v1",
 					Object: `
-						list:
-						- a
-						- b
-						- c
-						- d
-					`,
-				},
-				Update{
-					Manager:    "controller",
-					APIVersion: "v1",
-					Object: `
-						list:
-						- a
-						- d
-						- c
-						- b
+						string: "string"
 					`,
 				},
 				Apply{
 					Manager:    "default",
 					APIVersion: "v1",
-					Object: `
-						list:
-						- a
-						- b
-						- c
-						- d
-					`,
+					Object:     ``,
 				},
 			},
 			Object: `
-				list:
-				- a
-				- b
-				- c
-				- d
+				string: "string"
 			`,
-			Managed: fieldpath.ManagedFields{
-				"default": &fieldpath.VersionedSet{
-					Set: _NS(
-						_P("list", _SV("a")),
-						_P("list", _SV("b")),
-						_P("list", _SV("c")),
-						_P("list", _SV("d")),
-					),
-					APIVersion: "v1",
-				},
-			},
+			Managed: fieldpath.ManagedFields{},
 		},
 	}
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			if test.Test(typed.DeducedParseableType{}) == nil {
-				t.Fatal("Broken test passed")
+			if err := test.Test(typed.DeducedParseableType{}); err != nil {
+				t.Fatal(err)
 			}
 		})
 	}