From 675cefa1d15cadc5d1772d0ced16a3e843488347 Mon Sep 17 00:00:00 2001
From: Andrea Tosatto <andrea.tosy@gmail.com>
Date: Tue, 26 Jan 2021 23:29:32 +0000
Subject: [PATCH] Address golint warnings

---
 staging/src/k8s.io/client-go/go.mod                |  1 +
 staging/src/k8s.io/client-go/go.sum                |  2 ++
 .../k8s.io/client-go/transport/round_trippers.go   |  2 +-
 .../client-go/transport/round_trippers_test.go     | 14 +++++++-------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod
index ce0f92d94d8..7c9d4c77edc 100644
--- a/staging/src/k8s.io/client-go/go.mod
+++ b/staging/src/k8s.io/client-go/go.mod
@@ -28,6 +28,7 @@ require (
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0
+	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
diff --git a/staging/src/k8s.io/client-go/go.sum b/staging/src/k8s.io/client-go/go.sum
index 3b41835e9f7..bd5d4aac3da 100644
--- a/staging/src/k8s.io/client-go/go.sum
+++ b/staging/src/k8s.io/client-go/go.sum
@@ -428,6 +428,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
diff --git a/staging/src/k8s.io/client-go/transport/round_trippers.go b/staging/src/k8s.io/client-go/transport/round_trippers.go
index 25e26f6003f..554ff399fd3 100644
--- a/staging/src/k8s.io/client-go/transport/round_trippers.go
+++ b/staging/src/k8s.io/client-go/transport/round_trippers.go
@@ -378,7 +378,7 @@ const (
 
 // NewDebuggingRoundTripper allows to display in the logs output debug information
 // on the API requests performed by the client.
-func NewDebuggingRoundTripper(rt http.RoundTripper, levels ...DebugLevel) *debuggingRoundTripper {
+func NewDebuggingRoundTripper(rt http.RoundTripper, levels ...DebugLevel) http.RoundTripper {
 	drt := &debuggingRoundTripper{
 		delegatedRoundTripper: rt,
 		levels:                make(map[DebugLevel]bool, len(levels)),
diff --git a/staging/src/k8s.io/client-go/transport/round_trippers_test.go b/staging/src/k8s.io/client-go/transport/round_trippers_test.go
index c55ac0f8f14..81571226d3e 100644
--- a/staging/src/k8s.io/client-go/transport/round_trippers_test.go
+++ b/staging/src/k8s.io/client-go/transport/round_trippers_test.go
@@ -419,7 +419,7 @@ func TestHeaderEscapeRoundTrip(t *testing.T) {
 func TestDebuggingRoundTripper(t *testing.T) {
 	t.Parallel()
 
-	rawUrl := "https://127.0.0.1:12345/api/v1/pods?limit=500"
+	rawURL := "https://127.0.0.1:12345/api/v1/pods?limit=500"
 	req := &http.Request{
 		Method: http.MethodGet,
 		Header: map[string][]string{
@@ -440,7 +440,7 @@ func TestDebuggingRoundTripper(t *testing.T) {
 	}{
 		{
 			levels:              []DebugLevel{DebugJustURL},
-			expectedOutputLines: []string{fmt.Sprintf("%s %s", req.Method, rawUrl)},
+			expectedOutputLines: []string{fmt.Sprintf("%s %s", req.Method, rawURL)},
 		},
 		{
 			levels: []DebugLevel{DebugRequestHeaders},
@@ -471,7 +471,7 @@ func TestDebuggingRoundTripper(t *testing.T) {
 		},
 		{
 			levels:              []DebugLevel{DebugURLTiming},
-			expectedOutputLines: []string{fmt.Sprintf("%s %s %s", req.Method, rawUrl, res.Status)},
+			expectedOutputLines: []string{fmt.Sprintf("%s %s %s", req.Method, rawURL, res.Status)},
 		},
 		{
 			levels:              []DebugLevel{DebugResponseStatus},
@@ -489,12 +489,12 @@ func TestDebuggingRoundTripper(t *testing.T) {
 		klog.SetOutput(tmpWriteBuffer)
 		klog.LogToStderr(false)
 
-		// parse rawUrl
-		parsedUrl, err := url.Parse(rawUrl)
+		// parse rawURL
+		parsedURL, err := url.Parse(rawURL)
 		if err != nil {
-			t.Fatalf("url.Parse(%q) returned error: %v", rawUrl, err)
+			t.Fatalf("url.Parse(%q) returned error: %v", rawURL, err)
 		}
-		req.URL = parsedUrl
+		req.URL = parsedURL
 
 		// execute the round tripper
 		rt := &testRoundTripper{