Add nested test for deduced types

Author: Antoine Pelisse

merge/deduced_test.go

@@ -333,6 +333,192 @@ func TestDeduced(t *testing.T) {
 			`,
 			Managed: fieldpath.ManagedFields{},
 		},
+		"apply_update_apply_nested": {
+			Ops: []Operation{
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						a: 1
+						b:
+						  c:
+						    d: 2
+						    e:
+						    - 1
+						    - 2
+						    - 3
+						    f:
+						    - name: n
+						      value: 1
+					`,
+				},
+				Update{
+					Manager:    "controller",
+					APIVersion: "v1",
+					Object: `
+						a: 1
+						b:
+						  c:
+						    d: 3
+						    e:
+						    - 1
+						    - 2
+						    - 3
+						    - 4
+						    f:
+						    - name: n
+						      value: 2
+						g: 5
+					`,
+				},
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						a: 2
+						b:
+						  c:
+						    d: 2
+						    e:
+						    - 3
+						    - 2
+						    - 1
+						    f:
+						    - name: n
+						      value: 1
+					`,
+					Conflicts: merge.Conflicts{
+						merge.Conflict{Manager: "controller", Path: _P("b", "c", "d")},
+						merge.Conflict{Manager: "controller", Path: _P("b", "c", "e")},
+						merge.Conflict{Manager: "controller", Path: _P("b", "c", "f")},
+					},
+				},
+				ForceApply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						a: 2
+						b:
+						  c:
+						    d: 2
+						    e:
+						    - 3
+						    - 2
+						    - 1
+						    f:
+						    - name: n
+						      value: 1
+					`,
+				},
+			},
+			Object: `
+				a: 2
+				b:
+				  c:
+				    d: 2
+				    e:
+				    - 3
+				    - 2
+				    - 1
+				    f:
+				    - name: n
+				      value: 1
+				g: 5
+			`,
+		},
+		"apply_update_apply_nested_different_version": {
+			Ops: []Operation{
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						a: 1
+						b:
+						  c:
+						    d: 2
+						    e:
+						    - 1
+						    - 2
+						    - 3
+						    f:
+						    - name: n
+						      value: 1
+					`,
+				},
+				Update{
+					Manager:    "controller",
+					APIVersion: "v2",
+					Object: `
+						a: 1
+						b:
+						  c:
+						    d: 3
+						    e:
+						    - 1
+						    - 2
+						    - 3
+						    - 4
+						    f:
+						    - name: n
+						      value: 2
+						g: 5
+					`,
+				},
+				Apply{
+					Manager:    "default",
+					APIVersion: "v3",
+					Object: `
+						a: 2
+						b:
+						  c:
+						    d: 2
+						    e:
+						    - 3
+						    - 2
+						    - 1
+						    f:
+						    - name: n
+						      value: 1
+					`,
+					Conflicts: merge.Conflicts{
+						merge.Conflict{Manager: "controller", Path: _P("b", "c", "d")},
+						merge.Conflict{Manager: "controller", Path: _P("b", "c", "e")},
+						merge.Conflict{Manager: "controller", Path: _P("b", "c", "f")},
+					},
+				},
+				ForceApply{
+					Manager:    "default",
+					APIVersion: "v3",
+					Object: `
+						a: 2
+						b:
+						  c:
+						    d: 2
+						    e:
+						    - 3
+						    - 2
+						    - 1
+						    f:
+						    - name: n
+						      value: 1
+					`,
+				},
+			},
+			Object: `
+				a: 2
+				b:
+				  c:
+				    d: 2
+				    e:
+				    - 3
+				    - 2
+				    - 1
+				    f:
+				    - name: n
+				      value: 1
+				g: 5
+			`,
+		},
 	}
 
 	for name, test := range tests {