From 5b8ad0da8eeee25ac18ecf0c37a6b59c91c43f05 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Tue, 16 Nov 2021 16:57:58 +0100 Subject: [PATCH 1/4] migrate nolint coments to golangci-lint Kubernetes-commit: d126b1483840b5ea7c0891d3e7a693bd50fae7f8 --- discovery/discovery_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go index 96159ab7..50e59c5d 100644 --- a/discovery/discovery_client.go +++ b/discovery/discovery_client.go @@ -27,7 +27,7 @@ import ( "sync" "time" - //lint:ignore SA1019 Keep using module since it's still being maintained and the api of google.golang.org/protobuf/proto differs + //nolint:staticcheck // SA1019 Keep using module since it's still being maintained and the api of google.golang.org/protobuf/proto differs "github.com/golang/protobuf/proto" openapi_v2 "github.com/googleapis/gnostic/openapiv2" From 2e69bf9be06d99291bd5911c6b3643564a0b99ea Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Tue, 16 Nov 2021 16:58:52 +0100 Subject: [PATCH 2/4] fix unassigned error on client-go test Kubernetes-commit: 01a0fba3620c433f49120d82f908069281482a17 --- tools/clientcmd/loader_test.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/clientcmd/loader_test.go b/tools/clientcmd/loader_test.go index 1e770e67..bebc7fea 100644 --- a/tools/clientcmd/loader_test.go +++ b/tools/clientcmd/loader_test.go @@ -669,7 +669,9 @@ func Example_noMergingOnExplicitPaths() { } mergedConfig, err := loadingRules.Load() - + if err != nil { + fmt.Printf("Unexpected error: %v", err) + } json, err := runtime.Encode(clientcmdlatest.Codec, mergedConfig) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -715,7 +717,9 @@ func Example_mergingSomeWithConflict() { } mergedConfig, err := loadingRules.Load() - + if err != nil { + fmt.Printf("Unexpected error: %v", err) + } json, err := runtime.Encode(clientcmdlatest.Codec, mergedConfig) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -774,7 +778,9 @@ func Example_mergingEverythingNoConflicts() { } mergedConfig, err := loadingRules.Load() - + if err != nil { + fmt.Printf("Unexpected error: %v", err) + } json, err := runtime.Encode(clientcmdlatest.Codec, mergedConfig) if err != nil { fmt.Printf("Unexpected error: %v", err) From d62dc4e20e3d6cc0b94e8d55b5e8db8aaf0e538b Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Tue, 16 Nov 2021 19:00:31 +0100 Subject: [PATCH 3/4] no lint unused variables Kubernetes-commit: 0019f986130fdd8ca17c6e5511b15168d9181b1e --- rest/request_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rest/request_test.go b/rest/request_test.go index 7b1d83ad..6d1485df 100644 --- a/rest/request_test.go +++ b/rest/request_test.go @@ -1436,25 +1436,35 @@ func TestRequestStream(t *testing.T) { } } +//nolint:unused type fakeUpgradeConnection struct{} +//nolint:unused func (c *fakeUpgradeConnection) CreateStream(headers http.Header) (httpstream.Stream, error) { return nil, nil } + +//nolint:unused func (c *fakeUpgradeConnection) Close() error { return nil } + +//nolint:unused func (c *fakeUpgradeConnection) CloseChan() <-chan bool { return make(chan bool) } + +//nolint:unused func (c *fakeUpgradeConnection) SetIdleTimeout(timeout time.Duration) { } +//nolint:unused type fakeUpgradeRoundTripper struct { req *http.Request conn httpstream.Connection } +//nolint:unused func (f *fakeUpgradeRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { f.req = req b := []byte{} @@ -1466,6 +1476,7 @@ func (f *fakeUpgradeRoundTripper) RoundTrip(req *http.Request) (*http.Response, return resp, nil } +//nolint:unused func (f *fakeUpgradeRoundTripper) NewConnection(resp *http.Response) (httpstream.Connection, error) { return f.conn, nil } From 34c99305b59488130a05feda6d3ea9ebe28bff67 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Tue, 16 Nov 2021 22:54:18 +0100 Subject: [PATCH 4/4] remove unused fakeUpgradeConnection Kubernetes-commit: bf9ce7fd76068903e909358d2b25b05da7e4a431 --- rest/request_test.go | 46 -------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/rest/request_test.go b/rest/request_test.go index 6d1485df..30ae87d8 100644 --- a/rest/request_test.go +++ b/rest/request_test.go @@ -47,7 +47,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/watch" @@ -1436,51 +1435,6 @@ func TestRequestStream(t *testing.T) { } } -//nolint:unused -type fakeUpgradeConnection struct{} - -//nolint:unused -func (c *fakeUpgradeConnection) CreateStream(headers http.Header) (httpstream.Stream, error) { - return nil, nil -} - -//nolint:unused -func (c *fakeUpgradeConnection) Close() error { - return nil -} - -//nolint:unused -func (c *fakeUpgradeConnection) CloseChan() <-chan bool { - return make(chan bool) -} - -//nolint:unused -func (c *fakeUpgradeConnection) SetIdleTimeout(timeout time.Duration) { -} - -//nolint:unused -type fakeUpgradeRoundTripper struct { - req *http.Request - conn httpstream.Connection -} - -//nolint:unused -func (f *fakeUpgradeRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { - f.req = req - b := []byte{} - body := ioutil.NopCloser(bytes.NewReader(b)) - resp := &http.Response{ - StatusCode: http.StatusSwitchingProtocols, - Body: body, - } - return resp, nil -} - -//nolint:unused -func (f *fakeUpgradeRoundTripper) NewConnection(resp *http.Response) (httpstream.Connection, error) { - return f.conn, nil -} - func TestRequestDo(t *testing.T) { testCases := []struct { Request *Request