Skip to content

K
k3s
Unverified Commit b765203a authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Handle more cases in diff.ObjectReflectDiff

Interfaces and nested map values were not being recursed.
parent cd7a56ba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/util/diff/diff.go
View file @ b765203a
...@@ -145,7 +145,7 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff { ...@@ -145,7 +145,7 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
} }
} }
return changes return changes
case reflect.Ptr: case reflect.Ptr, reflect.Interface:
if a.IsNil() || b.IsNil() { if a.IsNil() || b.IsNil() {
switch { switch {
case a.IsNil() && b.IsNil(): case a.IsNil() && b.IsNil():
...@@ -199,7 +199,7 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff { ...@@ -199,7 +199,7 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
if reflect.DeepEqual(a.MapIndex(key).Interface(), b.MapIndex(key).Interface()) { if reflect.DeepEqual(a.MapIndex(key).Interface(), b.MapIndex(key).Interface()) {
continue continue
} }
missing = append(missing, diff{path: path.Key(fmt.Sprintf("%s", key.Interface())), a: a.MapIndex(key).Interface(), b: b.MapIndex(key).Interface()}) missing = append(missing, objectReflectDiff(path.Key(fmt.Sprintf("%s", key.Interface())), a.MapIndex(key), b.MapIndex(key))...)
continue continue
} }
missing = append(missing, diff{path: path.Key(fmt.Sprintf("%s", key.Interface())), a: nil, b: b.MapIndex(key).Interface()}) missing = append(missing, diff{path: path.Key(fmt.Sprintf("%s", key.Interface())), a: nil, b: b.MapIndex(key).Interface()})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment