From 168677400c964fe823b985db35b5e1473db17b0f Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Thu, 25 Jun 2020 17:04:41 -0500 Subject: [PATCH 1/6] fix S1039 unnecessary use of fmt.Sprintf Signed-off-by: Ken Sipe --- .../pkg/endpoints/handlers/fieldmanager/structuredmerge.go | 2 +- .../k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/structuredmerge.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/structuredmerge.go index 216a39cf7a5..b801d3d4717 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/structuredmerge.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/structuredmerge.go @@ -116,7 +116,7 @@ func (f *structuredMergeManager) Apply(liveObj, patchObj runtime.Object, managed return nil, nil, fmt.Errorf("couldn't get accessor: %v", err) } if patchObjMeta.GetManagedFields() != nil { - return nil, nil, errors.NewBadRequest(fmt.Sprintf("metadata.managedFields must be nil")) + return nil, nil, errors.NewBadRequest("metadata.managedFields must be nil") } liveObjVersioned, err := f.toVersioned(liveObj) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go index e42c93b5b57..2908c25c0f5 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go @@ -877,7 +877,7 @@ func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) { resourceVersion := uint64(1000) err = cacher.watchCache.Add(&examplev1.Pod{ ObjectMeta: metav1.ObjectMeta{ - Name: fmt.Sprintf("pod-0"), + Name: "pod-0", Namespace: "ns", ResourceVersion: fmt.Sprintf("%v", resourceVersion), }}) From 6c49299739a9819c3672248517ab3d6636d1d8c6 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Thu, 25 Jun 2020 17:10:34 -0500 Subject: [PATCH 2/6] fix S1021 var declaration Signed-off-by: Ken Sipe --- .../pkg/admission/plugin/webhook/generic/conversion_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/conversion_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/conversion_test.go index 4e609f060ef..fa504aea429 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/conversion_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/conversion_test.go @@ -104,7 +104,7 @@ func TestConvertToGVK(t *testing.T) { }, }, Spec: example2v1.ReplicaSetSpec{ - Replicas: func() *int32 { var i int32; i = 1; return &i }(), + Replicas: func() *int32 { var i int32 = 1; return &i }(), }, }, }, diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go index 1f614c2033f..3bf47011dfe 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go @@ -301,8 +301,7 @@ func TestWatchDeleteEventObjectHaveLatestRV(t *testing.T) { e := <-w.ResultChan() watchedDeleteObj := e.Object.(*example.Pod) - var wres clientv3.WatchResponse - wres = <-etcdW + wres := <-etcdW watchedDeleteRev, err := store.versioner.ParseResourceVersion(watchedDeleteObj.ResourceVersion) if err != nil { From a549d0a75e3a09d26f3a316982ff3711be4ed1d2 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Thu, 25 Jun 2020 17:23:37 -0500 Subject: [PATCH 3/6] fix SA2006 value of err not used Signed-off-by: Ken Sipe --- .../endpoints/handlers/fieldmanager/fieldmanager_test.go | 1 - .../apiserver/pkg/registry/generic/registry/dryrun_test.go | 3 +++ .../k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go | 4 ++-- .../k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go index 7dc59285d33..48ee9fd7a0e 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go @@ -61,7 +61,6 @@ func (c *fakeObjectConvertor) Convert(in, out, context interface{}) error { out, err = c.converter.Convert(typedValue, c.apiVersion) return err } - out = in return nil } diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun_test.go index fc57d73fc27..5d40004272c 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun_test.go @@ -186,6 +186,9 @@ func TestDryRunUpdateDoesntUpdate(t *testing.T) { } out := UnstructuredOrDie(`{}`) err = s.Get(context.Background(), "key", storage.GetOptions{}, out) + if err != nil { + t.Fatalf("Failed to get storage: %v", err) + } if !reflect.DeepEqual(created, out) { t.Fatalf("Returned object %q different from expected %q", created, out) } diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go index 592733c38f0..0f53a7edff3 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go @@ -886,7 +886,7 @@ func (t *Tester) testDeleteWithUID(obj runtime.Object, createFn CreateFunc, getF t.Errorf("unexpected error: %v", err) } opts.Preconditions = metav1.NewPreconditionDeleteOptions("UID1111").Preconditions - obj, _, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts) + _, _, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts) if err == nil || !errors.IsConflict(err) { t.Errorf("unexpected error: %v", err) } @@ -923,7 +923,7 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea t.Errorf("unexpected error: %v", err) } opts.Preconditions = metav1.NewRVDeletionPrecondition("RV1111").Preconditions - obj, wasDeleted, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts) + _, wasDeleted, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts) if err == nil || !errors.IsConflict(err) { t.Errorf("unexpected error: %v", err) } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go index 7c0c61c8048..ca2004e46a6 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go @@ -34,10 +34,11 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" + "k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/etcd3" - "k8s.io/client-go/tools/cache" ) func makeTestPod(name string, resourceVersion uint64) *v1.Pod { @@ -405,6 +406,9 @@ func TestWaitUntilFreshAndList(t *testing.T) { {IndexName: "l:not-exist-label", Value: "whatever"}, } list, resourceVersion, err = store.WaitUntilFreshAndList(5, matchValues, nil) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } if resourceVersion != 5 { t.Errorf("unexpected resourceVersion: %v, expected: 5", resourceVersion) } From a4d05d51d95d30ebe90ec8f652c9a794caa44d53 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Thu, 25 Jun 2020 17:26:42 -0500 Subject: [PATCH 4/6] fix S1019 use of make Signed-off-by: Ken Sipe --- .../k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go | 2 +- .../pkg/util/shufflesharding/shufflesharding_test.go | 6 +++--- staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go index ca2004e46a6..cedf2ac3640 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go @@ -139,7 +139,7 @@ func TestWatchCacheBasic(t *testing.T) { "prefix/ns/pod2": *makeTestStoreElement(makeTestPod("pod2", 5)), "prefix/ns/pod3": *makeTestStoreElement(makeTestPod("pod3", 6)), } - items := make(map[string]storeElement, 0) + items := make(map[string]storeElement) for _, item := range store.List() { elem := item.(*storeElement) items[elem.Key] = *elem diff --git a/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go b/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go index 4e71a942a14..85230a83a06 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go @@ -277,7 +277,7 @@ func TestDealer_DealIntoHand(t *testing.T) { }, { "size: 6 cap: 6 slice", - make([]int, 6, 6), + make([]int, 6), 6, }, { @@ -287,7 +287,7 @@ func TestDealer_DealIntoHand(t *testing.T) { }, { "size: 4 cap: 4 slice", - make([]int, 4, 4), + make([]int, 4), 6, }, { @@ -297,7 +297,7 @@ func TestDealer_DealIntoHand(t *testing.T) { }, { "size: 10 cap: 10 slice", - make([]int, 10, 10), + make([]int, 10), 6, }, { diff --git a/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go index 1c049aad7a2..53ae32a3741 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go @@ -238,7 +238,7 @@ func TestVersionedConn(t *testing.T) { conn := NewConn(supportedProtocols) // note that it's not enough to wait for conn.ready to avoid a race here. Hence, // we use a channel. - selectedProtocol := make(chan string, 0) + selectedProtocol := make(chan string) s, addr := newServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { p, _, _ := conn.Open(w, req) selectedProtocol <- p From 1d795002919675b8cf3bf462b6543fef843b5b54 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Thu, 25 Jun 2020 17:29:42 -0500 Subject: [PATCH 5/6] fix S1023 redundant return statement Signed-off-by: Ken Sipe --- staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go | 1 - .../src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go | 1 - .../pkg/util/flowcontrol/fairqueuing/queueset/queueset.go | 1 - .../apiserver/pkg/util/shufflesharding/shufflesharding_test.go | 1 - staging/src/k8s.io/apiserver/pkg/util/webhook/webhook_test.go | 1 - 5 files changed, 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go index 6554fb0133f..8717c526125 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go @@ -404,7 +404,6 @@ func TestGOAWAYHTTP1Requests(t *testing.T) { s := httptest.NewUnstartedServer(WithProbabilisticGoaway(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) w.Write([]byte("hello")) - return }), 1)) http2Options := &http2.Server{} diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go index 2f93df73d35..8075970127a 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go @@ -636,7 +636,6 @@ func (meal *cfgMeal) imaginePL(proto *flowcontrol.PriorityLevelConfiguration, re if proto.Spec.Limited != nil { meal.shareSum += float64(proto.Spec.Limited.AssuredConcurrencyShares) } - return } type immediateRequest struct{} diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go index b61d8ce7d07..2f84a3f9e67 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go @@ -630,7 +630,6 @@ func (qs *queueSet) cancelWait(req *request) { break } } - return } // selectQueueLocked examines the queues in round robin order and diff --git a/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go b/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go index 85230a83a06..9c728778084 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/shufflesharding/shufflesharding_test.go @@ -254,7 +254,6 @@ func TestUniformDistribution(t *testing.T) { t.Errorf("Only %v percent of the hands got a central count", goodPct) } } - return } func TestDealer_DealIntoHand(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook_test.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook_test.go index c38c3ce7dd2..755e957c364 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook_test.go @@ -422,7 +422,6 @@ func TestRequestTimeout(t *testing.T) { handler := func(w http.ResponseWriter, r *http.Request) { <-done - return } // Create and start a simple HTTPS server From 3de47dc05853131dcfc588bf2043207487cdd7c4 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Thu, 25 Jun 2020 17:31:38 -0500 Subject: [PATCH 6/6] fixing unwanted editor changes Signed-off-by: Ken Sipe --- .../k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go index cedf2ac3640..acf34de1f17 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go @@ -34,11 +34,10 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/tools/cache" - "k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/etcd3" + "k8s.io/client-go/tools/cache" ) func makeTestPod(name string, resourceVersion uint64) *v1.Pod {