From c38a06bca6bb360caf9bc679ba19a5a4be662bd1 Mon Sep 17 00:00:00 2001 From: tanjing2020 Date: Fri, 11 Dec 2020 14:23:30 +0800 Subject: [PATCH] fix staticcheck failures on vendor/k8s.io/apiserver/pkg/endpoints --- hack/.staticcheck_failures | 1 - .../src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go | 6 +----- staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index b83e01c54ea..8847f0012cc 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -14,7 +14,6 @@ vendor/k8s.io/apimachinery/pkg/util/net vendor/k8s.io/apimachinery/pkg/util/sets/types vendor/k8s.io/apimachinery/pkg/util/strategicpatch vendor/k8s.io/apimachinery/pkg/util/wait -vendor/k8s.io/apiserver/pkg/endpoints vendor/k8s.io/apiserver/pkg/endpoints/filters vendor/k8s.io/apiserver/pkg/endpoints/handlers vendor/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager 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 f8b393fc7f6..15855d18fae 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -356,11 +356,7 @@ type SimpleRESTStorage struct { requestedResourceVersion string requestedResourceNamespace string - // The id requested, and location to return for ResourceLocation - requestedResourceLocationID string - resourceLocation *url.URL - resourceLocationTransport http.RoundTripper - expectedResourceNamespace string + expectedResourceNamespace string // If non-nil, called inside the WorkFunc when answering update, delete, create. // obj receives the original input to the update, delete, or create call. 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 998888c779c..c5cce9ff840 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go @@ -922,7 +922,7 @@ func runWatchHTTPBenchmark(b *testing.B, items []example.Pod) { go func() { defer response.Body.Close() if _, err := io.Copy(ioutil.Discard, response.Body); err != nil { - b.Fatal(err) + b.Error(err) } wg.Done() }() @@ -962,7 +962,7 @@ func BenchmarkWatchWebsocket(b *testing.B) { go func() { defer ws.Close() if _, err := io.Copy(ioutil.Discard, ws); err != nil { - b.Fatal(err) + b.Error(err) } wg.Done() }() @@ -1011,7 +1011,7 @@ func BenchmarkWatchProtobuf(b *testing.B) { go func() { defer response.Body.Close() if _, err := io.Copy(ioutil.Discard, response.Body); err != nil { - b.Fatal(err) + b.Error(err) } wg.Done() }()