Merge pull request #332 from harshanarayana/bug/GIT-331/fix-variable-shadown

GIT-331: fix shadowing key from the kv pair

Author: k8s-ci-robot

internal/serialize/keyvalues.go

@@ -109,10 +109,10 @@ func KVListFormat(b *bytes.Buffer, keysAndValues ...interface{}) {
 		// https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/migration-to-structured-logging.md#name-arguments
 		// for the sake of performance. Keys with spaces,
 		// special characters, etc. will break parsing.
-		if k, ok := k.(string); ok {
+		if sK, ok := k.(string); ok {
 			// Avoid one allocation when the key is a string, which
 			// normally it should be.
-			b.WriteString(k)
+			b.WriteString(sK)
 		} else {
 			b.WriteString(fmt.Sprintf("%s", k))
 		}

internal/serialize/keyvalues_test.go

@@ -140,6 +140,18 @@ No whitespace.`,
 			keysValues: []interface{}{"point-1", point{100, 200}, "point-2", emptyPoint},
 			want:       " point-1=\"x=100, y=200\" point-2=\"<panic: value method k8s.io/klog/v2/internal/serialize_test.point.String called using nil *point pointer>\"",
 		},
+		{
+			keysValues: []interface{}{struct{ key string }{key: "k1"}, "value"},
+			want:       " {k1}=\"value\"",
+		},
+		{
+			keysValues: []interface{}{1, "test"},
+			want:       " %!s(int=1)=\"test\"",
+		},
+		{
+			keysValues: []interface{}{map[string]string{"k": "key"}, "value"},
+			want:       " map[k:key]=\"value\"",
+		},
 	}
 
 	for _, d := range testKVList {