From 89a6533ef649d1b5c9518a83c962859d29ebf52e Mon Sep 17 00:00:00 2001 From: haoshuwei Date: Mon, 9 Sep 2019 11:34:21 +0800 Subject: [PATCH 1/3] fix ineffassign --- pkg/volume/csi/csi_plugin_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/volume/csi/csi_plugin_test.go b/pkg/volume/csi/csi_plugin_test.go index 0e77da2acc2..e6d34e14357 100644 --- a/pkg/volume/csi/csi_plugin_test.go +++ b/pkg/volume/csi/csi_plugin_test.go @@ -620,6 +620,9 @@ func TestPluginNewMounter(t *testing.T) { if csiClient == nil { t.Error("mounter csiClient is nil") } + if err != nil { + t.Fatal(err) + } if csiMounter.volumeLifecycleMode != test.volumeLifecycleMode { t.Error("unexpected driver mode:", csiMounter.volumeLifecycleMode) } From aaed9daf9b44757e767d93bd45d1bb0412c00243 Mon Sep 17 00:00:00 2001 From: haoshuwei Date: Mon, 9 Sep 2019 18:52:17 +0800 Subject: [PATCH 2/3] fix some ineffassigns Signed-off-by: haoshuwei --- .../apiserver/pkg/endpoints/apiserver_test.go | 39 +++++++++++++++++++ .../pkg/endpoints/patchhandler_test.go | 15 +++++++ .../pkg/endpoints/request/context_test.go | 2 +- .../apiserver/pkg/endpoints/watch_test.go | 6 +++ .../registry/generic/registry/store_test.go | 7 +++- .../registry/generic/rest/streamer_test.go | 4 +- .../pkg/storage/value/encrypt/aes/aes_test.go | 4 +- .../value/encrypt/secretbox/secretbox_test.go | 2 +- 8 files changed, 71 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index cddd43344db..f5d093e0e4a 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -3078,6 +3078,9 @@ func TestDelete(t *testing.T) { client := http.Client{} request, err := http.NewRequest("DELETE", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, nil) + if err != nil { + t.Errorf("unexpected error: %v", err) + } res, err := client.Do(request) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -3110,6 +3113,9 @@ func TestDeleteWithOptions(t *testing.T) { client := http.Client{} request, err := http.NewRequest("DELETE", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } res, err := client.Do(request) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -3147,6 +3153,9 @@ func TestDeleteWithOptionsQuery(t *testing.T) { client := http.Client{} request, err := http.NewRequest("DELETE", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID+"?gracePeriodSeconds="+strconv.FormatInt(grace, 10), nil) + if err != nil { + t.Errorf("unexpected error: %v", err) + } res, err := client.Do(request) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -3187,6 +3196,9 @@ func TestDeleteWithOptionsQueryAndBody(t *testing.T) { } client := http.Client{} request, err := http.NewRequest("DELETE", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID+"?gracePeriodSeconds="+strconv.FormatInt(grace+10, 10), bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } res, err := client.Do(request) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -3223,6 +3235,9 @@ func TestDeleteInvokesAdmissionControl(t *testing.T) { client := http.Client{} request, err := http.NewRequest("DELETE", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, nil) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3246,6 +3261,9 @@ func TestDeleteMissing(t *testing.T) { client := http.Client{} request, err := http.NewRequest("DELETE", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, nil) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3286,6 +3304,9 @@ func TestUpdate(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3328,6 +3349,9 @@ func TestUpdateInvokesAdmissionControl(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3361,6 +3385,9 @@ func TestUpdateRequiresMatchingName(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3395,6 +3422,9 @@ func TestUpdateAllowsMissingNamespace(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3436,6 +3466,9 @@ func TestUpdateDisallowsMismatchedNamespaceOnError(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3475,6 +3508,9 @@ func TestUpdatePreventsMismatchedNamespace(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) @@ -3509,6 +3545,9 @@ func TestUpdateMissing(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PUT", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader(body)) + if err != nil { + t.Errorf("unexpected error: %v", err) + } response, err := client.Do(request) if err != nil { t.Errorf("unexpected error: %v", err) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/patchhandler_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/patchhandler_test.go index f27a702dffd..d3e198f1fed 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/patchhandler_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/patchhandler_test.go @@ -53,6 +53,9 @@ func TestPatch(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PATCH", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader([]byte(`{"labels":{"foo":"bar"}}`))) + if err != nil { + t.Errorf("unexpected error: %v", err) + } request.Header.Set("Content-Type", "application/merge-patch+json; charset=UTF-8") response, err := client.Do(request) if err != nil { @@ -94,6 +97,9 @@ func TestForbiddenForceOnNonApply(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PATCH", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader([]byte(`{"labels":{"foo":"bar"}}`))) + if err != nil { + t.Errorf("unexpected error: %v", err) + } request.Header.Set("Content-Type", "application/merge-patch+json; charset=UTF-8") _, err = client.Do(request) if err != nil { @@ -101,6 +107,9 @@ func TestForbiddenForceOnNonApply(t *testing.T) { } request, err = http.NewRequest("PATCH", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID+"?force=true", bytes.NewReader([]byte(`{"labels":{"foo":"bar"}}`))) + if err != nil { + t.Errorf("unexpected error: %v", err) + } request.Header.Set("Content-Type", "application/merge-patch+json; charset=UTF-8") response, err := client.Do(request) if err != nil { @@ -111,6 +120,9 @@ func TestForbiddenForceOnNonApply(t *testing.T) { } request, err = http.NewRequest("PATCH", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID+"?force=false", bytes.NewReader([]byte(`{"labels":{"foo":"bar"}}`))) + if err != nil { + t.Errorf("unexpected error: %v", err) + } request.Header.Set("Content-Type", "application/merge-patch+json; charset=UTF-8") response, err = client.Do(request) if err != nil { @@ -140,6 +152,9 @@ func TestPatchRequiresMatchingName(t *testing.T) { client := http.Client{} request, err := http.NewRequest("PATCH", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/simple/"+ID, bytes.NewReader([]byte(`{"metadata":{"name":"idbar"}}`))) + if err != nil { + t.Errorf("unexpected error: %v", err) + } request.Header.Set("Content-Type", "application/merge-patch+json") response, err := client.Do(request) if err != nil { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go index 72b3124b44e..d606c63c884 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go @@ -35,7 +35,7 @@ func TestNamespaceContext(t *testing.T) { } ctx = NewContext() - result, ok = NamespaceFrom(ctx) + _, ok = NamespaceFrom(ctx) if ok { t.Fatalf("Should not be ok because there is no namespace on the context") } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go index 63b2967d550..71c12c97eef 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go @@ -604,6 +604,9 @@ func TestWatchHTTPErrors(t *testing.T) { req, _ := http.NewRequest("GET", dest.String(), nil) client := http.Client{} resp, err := client.Do(req) + if err != nil { + t.Fatalf("Unexpected error: %v", err) + } errStatus := errors.NewInternalError(fmt.Errorf("we got an error")).Status() watcher.Error(&errStatus) watcher.Stop() @@ -728,6 +731,9 @@ func TestWatchHTTPTimeout(t *testing.T) { req, _ := http.NewRequest("GET", dest.String(), nil) client := http.Client{} resp, err := client.Do(req) + if err != nil { + t.Fatalf("Unexpected error: %v", err) + } watcher.Add(&apitesting.Simple{TypeMeta: metav1.TypeMeta{APIVersion: newGroupVersion.String()}}) // Make sure we can actually watch an endpoint diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go index 1e8da623704..23a31438ff6 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go @@ -316,13 +316,13 @@ func TestStoreCreate(t *testing.T) { } // create the object with denying admission - objA, err := registry.Create(testContext, podA, denyCreateValidation, &metav1.CreateOptions{}) + _, err := registry.Create(testContext, podA, denyCreateValidation, &metav1.CreateOptions{}) if err == nil { t.Errorf("Expected admission error: %v", err) } // create the object - objA, err = registry.Create(testContext, podA, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) + objA, err := registry.Create(testContext, podA, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) } @@ -1335,6 +1335,9 @@ func TestStoreDeletionPropagation(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } _, _, err = registry.Delete(testContext, pod.Name, rest.ValidateAllObjectFunc, tc.options) + if err != nil { + t.Fatalf("Unexpected error: %v", err) + } obj, err := registry.Get(testContext, pod.Name, &metav1.GetOptions{}) if tc.expectedNotFound { if err == nil || !errors.IsNotFound(err) { diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go index 4d9cd154339..fbf83632d3e 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go @@ -54,7 +54,7 @@ func TestInputStreamReader(t *testing.T) { return } defer readCloser.Close() - result, err := ioutil.ReadAll(readCloser) + result, _ := ioutil.ReadAll(readCloser) if string(result) != resultString { t.Errorf("Stream content does not match. Got: %s. Expected: %s.", string(result), resultString) } @@ -118,7 +118,7 @@ func TestInputStreamTransport(t *testing.T) { return } defer readCloser.Close() - result, err := ioutil.ReadAll(readCloser) + result, _ := ioutil.ReadAll(readCloser) if string(result) != message { t.Errorf("Stream content does not match. Got: %s. Expected: %s.", string(result), message) } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go index 4d4f35676ac..aea755423a5 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go @@ -78,7 +78,7 @@ func TestGCMKeyRotation(t *testing.T) { } // verify changing the context fails storage - from, stale, err = p.TransformFromStorage(out, value.DefaultContext([]byte("incorrect_context"))) + _, _, err = p.TransformFromStorage(out, value.DefaultContext([]byte("incorrect_context"))) if err == nil { t.Fatalf("expected unauthenticated data") } @@ -130,7 +130,7 @@ func TestCBCKeyRotation(t *testing.T) { } // verify changing the context fails storage - from, stale, err = p.TransformFromStorage(out, value.DefaultContext([]byte("incorrect_context"))) + _, _, err = p.TransformFromStorage(out, value.DefaultContext([]byte("incorrect_context"))) if err != nil { t.Fatalf("CBC mode does not support authentication: %v", err) } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go index b19ccc3061f..4d87708b0d8 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go @@ -58,7 +58,7 @@ func TestSecretboxKeyRotation(t *testing.T) { // verify changing the context does not fails storage // Secretbox is not currently an authenticating store - from, stale, err = p.TransformFromStorage(out, value.DefaultContext([]byte("incorrect_context"))) + _, _, err = p.TransformFromStorage(out, value.DefaultContext([]byte("incorrect_context"))) if err != nil { t.Fatalf("secretbox is not authenticated") } From 573dcd73648e670037aa5cb4fa844d037a2d69da Mon Sep 17 00:00:00 2001 From: haoshuwei Date: Tue, 10 Sep 2019 11:01:32 +0800 Subject: [PATCH 3/3] remove packages in hack/.staticcheck_failures which are passing staticcheck Signed-off-by: haoshuwei --- hack/.staticcheck_failures | 2 -- 1 file changed, 2 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 4e325233cb4..ee4e6bf5cbd 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -198,9 +198,7 @@ vendor/k8s.io/apiserver/pkg/storage vendor/k8s.io/apiserver/pkg/storage/cacher vendor/k8s.io/apiserver/pkg/storage/etcd3 vendor/k8s.io/apiserver/pkg/storage/tests -vendor/k8s.io/apiserver/pkg/storage/value/encrypt/aes vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope -vendor/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox vendor/k8s.io/apiserver/pkg/util/webhook vendor/k8s.io/apiserver/pkg/util/wsstream vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc