From 2fe82075b4443e8254204163e6d1469c9262bfb8 Mon Sep 17 00:00:00 2001 From: carlory Date: Mon, 26 Aug 2019 15:12:07 +0800 Subject: [PATCH] fix staticcheck faulures in 'cmd' pkg --- cmd/kube-proxy/app/server.go | 1 + cmd/linkcheck/links.go | 2 +- cmd/preferredimports/preferredimports.go | 3 ++- hack/.staticcheck_failures | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 51131702a2c..980889d9611 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -597,6 +597,7 @@ func (s *ProxyServer) Run() error { w.Header().Set("X-Content-Type-Options", "nosniff") fmt.Fprintf(w, "%s", s.ProxyMode) }) + //lint:ignore SA1019 See the Metrics Stability Migration KEP proxyMux.Handle("/metrics", legacyregistry.Handler()) if s.EnableProfiling { routes.Profiling{}.Install(proxyMux) diff --git a/cmd/linkcheck/links.go b/cmd/linkcheck/links.go index 4930b9bb33b..209416c0cfd 100644 --- a/cmd/linkcheck/links.go +++ b/cmd/linkcheck/links.go @@ -72,7 +72,7 @@ var ( ) func newWalkFunc(invalidLink *bool, client *http.Client) filepath.WalkFunc { - return func(filePath string, info os.FileInfo, err error) error { + return func(filePath string, info os.FileInfo, initErr error) error { hasSuffix := false for _, suffix := range *fileSuffix { hasSuffix = hasSuffix || strings.HasSuffix(info.Name(), suffix) diff --git a/cmd/preferredimports/preferredimports.go b/cmd/preferredimports/preferredimports.go index 2313ad21740..8052645d1f3 100644 --- a/cmd/preferredimports/preferredimports.go +++ b/cmd/preferredimports/preferredimports.go @@ -27,7 +27,6 @@ import ( "go/format" "go/parser" "go/token" - "golang.org/x/crypto/ssh/terminal" "io/ioutil" "log" "os" @@ -35,6 +34,8 @@ import ( "regexp" "sort" "strings" + + "golang.org/x/crypto/ssh/terminal" ) var ( diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 1baafd6f51b..50b40532af0 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -1,7 +1,5 @@ cluster/images/etcd-version-monitor cluster/images/etcd/migrate -cmd/kube-proxy/app -cmd/linkcheck pkg/controller/daemon pkg/controller/deployment pkg/controller/disruption