Merge pull request #65486 from liggitt/diff-type

Automatic merge from submit-queue (batch tested with PRs 65507, 65508, 65486). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. show type differences in reflect diff helps debugging type coercion round-tripping issues /assign @smarterclayton ```release-note NONE ```

Merge pull request #65486 from liggitt/diff-type
4d4bb53f · Kubernetes Submit Queue · GitHub · 5f7f5c43 · 6354665e · 4d4bb53f
Unverified Commit 4d4bb53f authored Jun 26, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

diff.go staging/src/k8s.io/apimachinery/pkg/util/diff/diff.go +8 -0

diff_test.go staging/src/k8s.io/apimachinery/pkg/util/diff/diff_test.go +5 -0

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/util/diff/diff.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/diff/diff.go
@@ -108,6 +108,14 @@ func limit(aObj, bObj interface{}, max int) (string, string) {
 	elidedASuffix := ""
 	elidedBSuffix := ""
 	a, b := fmt.Sprintf("%#v", aObj), fmt.Sprintf("%#v", bObj)
+
+	if aObj != nil && bObj != nil {
+		if aType, bType := fmt.Sprintf("%T", aObj), fmt.Sprintf("%T", bObj); aType != bType {
+			a = fmt.Sprintf("%s (%s)", a, aType)
+			b = fmt.Sprintf("%s (%s)", b, bType)
+		}
+	}
+
 	for {
 		switch {
 		case len(a) > max && len(a) > 4 && len(b) > 4 && a[:4] == b[:4]:

--- a/staging/src/k8s.io/apimachinery/pkg/util/diff/diff_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/diff/diff_test.go
@@ -75,6 +75,11 @@ object.A:
  a: []int(nil)
  b: []int{}`,
 		},
+		"display type differences": {a: []interface{}{int64(1)}, b: []interface{}{uint64(1)}, out: `
+object[0]:
+  a: 1 (int64)
+  b: 0x1 (uint64)`,
+		},
 	}
 	for name, test := range testCases {
 		expect := test.out