Merge pull request #99525 from kagaya85/fix-staticcheck

fix staticcheck for k8s.io/apiserver/pkg/endpoints

Kubernetes-commit: 066600f105ed01ed1106769bdcaf925e7552f038

Godeps/Godeps.json

@@ -700,7 +700,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "1f71974292e6"
+			"Rev": "264a74a451ef"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
@@ -708,7 +708,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "9409f5796d38"
+			"Rev": "fcacc4b270ff"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",

go.mod

@@ -41,9 +41,9 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/square/go-jose.v2 v2.2.2
 	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.0.0-20210304212041-1f71974292e6
+	k8s.io/api v0.0.0-20210305132010-264a74a451ef
 	k8s.io/apimachinery v0.0.0-20210304154449-569bd20062c9
-	k8s.io/client-go v0.0.0-20210304132206-9409f5796d38
+	k8s.io/client-go v0.0.0-20210305132213-fcacc4b270ff
 	k8s.io/component-base v0.0.0-20210304092723-b6d06acb8460
 	k8s.io/klog/v2 v2.5.0
 	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
@@ -54,8 +54,8 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20210304212041-1f71974292e6
+	k8s.io/api => k8s.io/api v0.0.0-20210305132010-264a74a451ef
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210304154449-569bd20062c9
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20210304132206-9409f5796d38
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210305132213-fcacc4b270ff
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20210304092723-b6d06acb8460
 )

go.sum

@@ -584,9 +584,9 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 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/api v0.0.0-20210304212041-1f71974292e6/go.mod h1:HGMdyFJB+72iMWQoS/EwpAtVFz79M8RyBuDE09jjiUM=
+k8s.io/api v0.0.0-20210305132010-264a74a451ef/go.mod h1:HGMdyFJB+72iMWQoS/EwpAtVFz79M8RyBuDE09jjiUM=
 k8s.io/apimachinery v0.0.0-20210304154449-569bd20062c9/go.mod h1:+s3G/nGQJY9oe1CFOXRrb9QkXTIEgTnFtF8GeKZIgOg=
-k8s.io/client-go v0.0.0-20210304132206-9409f5796d38/go.mod h1:8e1dQV5aiRbvDwbqMoJhxxW7nYgrs9iCGWjxHFJkuXo=
+k8s.io/client-go v0.0.0-20210305132213-fcacc4b270ff/go.mod h1:qOjE7Ev6K/dG0ODfUspgbcCsQmFSZLAQPKhTMHYBjzU=
 k8s.io/component-base v0.0.0-20210304092723-b6d06acb8460/go.mod h1:y2J5c34+m/mFnjMj5b/bma1BnxhJycBj9Z2VmzHUG50=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

pkg/endpoints/filters/audit_test.go

@@ -697,7 +697,7 @@ func TestAudit(t *testing.T) {
 			expectedID := types.UID("")
 			for i, expect := range test.expected {
 				event := events[i]
-				if "admin" != event.User.Username {
+				if event.User.Username != "admin" {
 					t.Errorf("Unexpected username: %s", event.User.Username)
 				}
 				if event.Stage != expect.Stage {

pkg/endpoints/filters/request_deadline.go

@@ -69,7 +69,7 @@ func withRequestDeadline(handler http.Handler, sink audit.Sink, policy policy.Ch
 
 		userSpecifiedTimeout, ok, err := parseTimeout(req)
 		if err != nil {
-			statusErr := apierrors.NewBadRequest(fmt.Sprintf("%s", err.Error()))
+			statusErr := apierrors.NewBadRequest(err.Error())
 
 			klog.Errorf("Error - %s: %#v", err.Error(), req.RequestURI)
 

pkg/endpoints/metrics/metrics.go

@@ -22,7 +22,6 @@ import (
 	"net"
 	"net/http"
 	"net/url"
-	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -217,8 +216,6 @@ var (
 		[]string{"verb", "group", "version", "resource", "subresource", "scope"},
 	)
 
-	kubectlExeRegexp = regexp.MustCompile(`^.*((?i:kubectl\.exe))`)
-
 	metrics = []resettableCollector{
 		deprecatedRequestGauge,
 		requestCounter,