fix imported bug time encode format form kvlistFormat

yuzhiquan · yuzhiquan · commit 1ccc0e1b27ff · 2020-06-03T09:04:39.000+08:00
gofmt

fix failed test case

remove unnecessary variable

add fmt.Stringer support

remove Objref from switch case
diff --git a/klog.go b/klog.go
@@ -800,10 +800,16 @@ func kvListFormat(b *bytes.Buffer, keysAndValues ...interface{}) {
 			v = missingValue
 		}
 		b.WriteByte(' ')
-		if _, ok := v.(fmt.Stringer); ok {
+
+		switch v.(type) {
+		case string:
 			b.WriteString(fmt.Sprintf("%s=%q", k, v))
-		} else {
-			b.WriteString(fmt.Sprintf("%s=%#v", k, v))
+		default:
+			if _, ok := v.(fmt.Stringer); ok {
+				b.WriteString(fmt.Sprintf("%s=%q", k, v))
+			} else {
+				b.WriteString(fmt.Sprintf("%s=%+v", k, v))
+			}
 		}
 	}
 }
diff --git a/klog_test.go b/klog_test.go
@@ -849,20 +849,21 @@ func TestKvListFormat(t *testing.T) {
 			keysValues: []interface{}{"pod", "kubedns", "spec", struct {
 				X int
 				Y string
-			}{X: 76, Y: "strval"}},
-			want: " pod=\"kubedns\" spec=struct { X int; Y string }{X:76, Y:\"strval\"}",
+				N time.Time
+			}{X: 76, Y: "strval", N: time.Date(2006, 1, 2, 15, 4, 5, .067890e9, time.UTC)}},
+			want: " pod=\"kubedns\" spec={X:76 Y:strval N:2006-01-02 15:04:05.06789 +0000 UTC}",
 		},
 		{
 			keysValues: []interface{}{"pod", "kubedns", "values", []int{8, 6, 7, 5, 3, 0, 9}},
-			want:       " pod=\"kubedns\" values=[]int{8, 6, 7, 5, 3, 0, 9}",
+			want:       " pod=\"kubedns\" values=[8 6 7 5 3 0 9]",
 		},
 		{
 			keysValues: []interface{}{"pod", "kubedns", "values", []string{"deployment", "svc", "configmap"}},
-			want:       " pod=\"kubedns\" values=[]string{\"deployment\", \"svc\", \"configmap\"}",
+			want:       " pod=\"kubedns\" values=[deployment svc configmap]",
 		},
 		{
 			keysValues: []interface{}{"pod", "kubedns", "maps", map[string]int{"three": 4}},
-			want:       " pod=\"kubedns\" maps=map[string]int{\"three\":4}",
+			want:       " pod=\"kubedns\" maps=map[three:4]",
 		},
 		{
 			keysValues: []interface{}{"pod", KRef("kube-system", "kubedns"), "status", "ready"},

Original file line number	Diff line number	Diff line change
`@@ -800,10 +800,16 @@ func kvListFormat(b *bytes.Buffer, keysAndValues ...interface{}) {`
`800`	`800`	`v = missingValue`
`801`	`801`	`}`
`802`	`802`	`b.WriteByte(' ')`
`803`		`- if _, ok := v.(fmt.Stringer); ok {`
	`803`	`+`
	`804`	`+ switch v.(type) {`
	`805`	`+ case string:`
`804`	`806`	`b.WriteString(fmt.Sprintf("%s=%q", k, v))`
`805`		`- } else {`
`806`		`- b.WriteString(fmt.Sprintf("%s=%#v", k, v))`
	`807`	`+ default:`
	`808`	`+ if _, ok := v.(fmt.Stringer); ok {`
	`809`	`+ b.WriteString(fmt.Sprintf("%s=%q", k, v))`
	`810`	`+ } else {`
	`811`	`+ b.WriteString(fmt.Sprintf("%s=%+v", k, v))`
	`812`	`+ }`
`807`	`813`	`}`
`808`	`814`	`}`
`809`	`815`	`}`