From 9688574bc6b9ac2bc36e11db2e04d83e66243889 Mon Sep 17 00:00:00 2001 From: Abhishek Kr Srivastav Date: Thu, 12 Sep 2024 18:15:22 +0530 Subject: [PATCH] Fix Go vet errors for master golang Co-authored-by: Rajalakshmi-Girish Co-authored-by: Abhishek Kr Srivastav Kubernetes-commit: 9d10ddb0608aa20ce287c89be879f888f5823cf9 --- pkg/cel/lazy/lazy_test.go | 2 +- pkg/endpoints/apiserver_test.go | 6 +++--- pkg/endpoints/handlers/responsewriters/writers_test.go | 2 +- pkg/server/filters/maxinflight.go | 2 +- pkg/storage/cacher/cacher_whitebox_test.go | 2 +- pkg/util/peerproxy/peerproxy_handler.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/cel/lazy/lazy_test.go b/pkg/cel/lazy/lazy_test.go index 7650e03ba..355d35bfa 100644 --- a/pkg/cel/lazy/lazy_test.go +++ b/pkg/cel/lazy/lazy_test.go @@ -60,7 +60,7 @@ func TestLazyMapType(t *testing.T) { evalCounter++ v, err := compileAndRun(env, activation, `{"a": "a"}`) if err != nil { - return types.NewErr(err.Error()) + return types.NewErr("%s", err.Error()) } return v }) diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go index 04a28e7fa..9b79c1d93 100644 --- a/pkg/endpoints/apiserver_test.go +++ b/pkg/endpoints/apiserver_test.go @@ -2818,7 +2818,7 @@ func TestDeleteWithOptions(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - t.Logf(string(s)) + t.Log(string(s)) } if simpleStorage.deleted != ID { t.Errorf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID) @@ -2858,7 +2858,7 @@ func TestDeleteWithOptionsQuery(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - t.Logf(string(s)) + t.Log(string(s)) } if simpleStorage.deleted != ID { t.Fatalf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID) @@ -2901,7 +2901,7 @@ func TestDeleteWithOptionsQueryAndBody(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - t.Logf(string(s)) + t.Log(string(s)) } if simpleStorage.deleted != ID { t.Errorf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID) diff --git a/pkg/endpoints/handlers/responsewriters/writers_test.go b/pkg/endpoints/handlers/responsewriters/writers_test.go index 6e9e30f61..874dc1980 100644 --- a/pkg/endpoints/handlers/responsewriters/writers_test.go +++ b/pkg/endpoints/handlers/responsewriters/writers_test.go @@ -326,7 +326,7 @@ func TestSerializeObject(t *testing.T) { compressionEnabled: true, statusCode: http.StatusInternalServerError, out: smallPayload, - outErrs: []error{fmt.Errorf(string(largePayload)), fmt.Errorf("bad2")}, + outErrs: []error{errors.New(string(largePayload)), errors.New("bad2")}, mediaType: "application/json", req: &http.Request{ Header: http.Header{ diff --git a/pkg/server/filters/maxinflight.go b/pkg/server/filters/maxinflight.go index 9effcb768..8672c0942 100644 --- a/pkg/server/filters/maxinflight.go +++ b/pkg/server/filters/maxinflight.go @@ -50,7 +50,7 @@ var ( func handleError(w http.ResponseWriter, r *http.Request, err error) { errorMsg := fmt.Sprintf("Internal Server Error: %#v", r.RequestURI) http.Error(w, errorMsg, http.StatusInternalServerError) - klog.Errorf(err.Error()) + klog.Error(err.Error()) } // requestWatermark is used to track maximal numbers of requests in a particular phase of handling diff --git a/pkg/storage/cacher/cacher_whitebox_test.go b/pkg/storage/cacher/cacher_whitebox_test.go index 12b1e9e8a..1245f7fd6 100644 --- a/pkg/storage/cacher/cacher_whitebox_test.go +++ b/pkg/storage/cacher/cacher_whitebox_test.go @@ -1603,7 +1603,7 @@ func verifyEvents(t *testing.T, w watch.Interface, events []watch.Event, strictO if !valid { t.Logf("(called from line %d)", line) for _, err := range errors { - t.Errorf(err) + t.Error(err) } } } diff --git a/pkg/util/peerproxy/peerproxy_handler.go b/pkg/util/peerproxy/peerproxy_handler.go index bc342165b..e16f88a46 100644 --- a/pkg/util/peerproxy/peerproxy_handler.go +++ b/pkg/util/peerproxy/peerproxy_handler.go @@ -176,7 +176,7 @@ func (h *peerProxyHandler) WrapHandler(handler http.Handler) http.Handler { // TODO: maintain locally serviceable GVRs somewhere so that we dont have to // consult the storageversion-informed map for those if len(serviceableByResp.peerEndpoints) == 0 { - klog.Errorf(fmt.Sprintf("GVR %v is not served by anything in this cluster", gvr)) + klog.Error(fmt.Sprintf("GVR %v is not served by anything in this cluster", gvr)) handler.ServeHTTP(w, r) return }