deep copy slice object during append

kubernetes-sigs · Jul 7, 2023 · 24aa83d · 24aa83d
1 parent 8e33abb
commit 24aa83d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/merge/conflict.go b/merge/conflict.go
@@ -112,7 +112,7 @@ func ConflictsFromManagers(sets fieldpath.ManagedFields) Conflicts {
 		set.Set().Iterate(func(p fieldpath.Path) {
 			conflicts = append(conflicts, Conflict{
 				Manager: manager,
-				Path:    p,
+				Path:    p.Copy(),
 			})
 		})
 	}

diff --git a/merge/conflict_test.go b/merge/conflict_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package merge_test
 
 import (
+	"reflect"
 	"testing"
 
 	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
@@ -92,3 +93,44 @@ func TestToSet(t *testing.T) {
 		t.Fatalf("expected\n%v\n, but got\n%v\n", expected, actual)
 	}
 }
+
+func TestConflictsFromManagers(t *testing.T) {
+	type args struct {
+		sets fieldpath.ManagedFields
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "test with common prefix",
+			args: args{
+				sets: fieldpath.ManagedFields{
+					"Bob": fieldpath.NewVersionedSet(
+						_NS(
+							_P("spec", "template", "spec", "containers", _KBF("name", "probe"), "livenessProbe", "exec", "command"),
+							_P("spec", "template", "spec", "containers", _KBF("name", "probe"), "livenessProbe", "periodSeconds"),
+							_P("spec", "template", "spec", "containers", _KBF("name", "probe"), "readinessProbe", "exec", "command"),
+							_P("spec", "template", "spec", "containers", _KBF("name", "probe"), "readinessProbe", "periodSeconds"),
+						),
+						"v1",
+						false,
+					),
+				},
+			},
+			want: `conflicts with "Bob":
+- .spec.template.spec.containers[name="probe"].livenessProbe.periodSeconds
+- .spec.template.spec.containers[name="probe"].livenessProbe.exec.command
+- .spec.template.spec.containers[name="probe"].readinessProbe.periodSeconds
+- .spec.template.spec.containers[name="probe"].readinessProbe.exec.command`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := merge.ConflictsFromManagers(tt.args.sets); !reflect.DeepEqual(got.Error(), tt.want) {
+				t.Errorf("ConflictsFromManagers() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}