github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65486 from liggitt/diff-type

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2018-06-26 23:17:05 -07:00 committed by GitHub
commit 4d4bb53fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apimachinery/pkg/util/diff/diff.go
View File

@ -108,6 +108,14 @@ func limit(aObj, bObj interface{}, max int) (string, string) {
elidedASuffix := "" elidedASuffix := ""
elidedBSuffix := "" elidedBSuffix := ""
a, b := fmt.Sprintf("%#v", aObj), fmt.Sprintf("%#v", bObj) 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 { for {
switch { switch {
case len(a) > max && len(a) > 4 && len(b) > 4 && a[:4] == b[:4]: case len(a) > max && len(a) > 4 && len(b) > 4 && a[:4] == b[:4]:

5
staging/src/k8s.io/apimachinery/pkg/util/diff/diff_test.go
View File

@ -75,6 +75,11 @@ object.A:
a: []int(nil) a: []int(nil)
b: []int{}`, 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 { for name, test := range testCases {
expect := test.out expect := test.out