From eaaa803d48e8d78e5ad6d49324169e9d775ed7bc Mon Sep 17 00:00:00 2001 From: Chok Yip Lau Date: Fri, 8 Jan 2021 17:57:20 -0500 Subject: [PATCH] Fix staticcheck on vendor/k8s.io/apiserver/pkg/server/httplog --- hack/.staticcheck_failures | 1 - staging/src/k8s.io/apiserver/pkg/server/httplog/httplog.go | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index fdad197f810..c297f75727f 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -26,7 +26,6 @@ vendor/k8s.io/apiserver/pkg/registry/generic/rest vendor/k8s.io/apiserver/pkg/registry/rest/resttest vendor/k8s.io/apiserver/pkg/server/dynamiccertificates vendor/k8s.io/apiserver/pkg/server/filters -vendor/k8s.io/apiserver/pkg/server/httplog vendor/k8s.io/apiserver/pkg/server/routes vendor/k8s.io/apiserver/pkg/storage vendor/k8s.io/apiserver/pkg/storage/cacher diff --git a/staging/src/k8s.io/apiserver/pkg/server/httplog/httplog.go b/staging/src/k8s.io/apiserver/pkg/server/httplog/httplog.go index 4cb5306672b..6e62a67a610 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/httplog/httplog.go +++ b/staging/src/k8s.io/apiserver/pkg/server/httplog/httplog.go @@ -65,6 +65,9 @@ type respLogger struct { // Simple logger that logs immediately when Addf is called type passthroughLogger struct{} +//lint:ignore SA1019 Interface implementation check to make sure we don't drop CloseNotifier again +var _ http.CloseNotifier = &respLogger{} + // Addf logs info immediately. func (passthroughLogger) Addf(format string, data ...interface{}) { klog.V(2).Info(fmt.Sprintf(format, data...)) @@ -225,6 +228,7 @@ func (rl *respLogger) Hijack() (net.Conn, *bufio.ReadWriter, error) { // CloseNotify implements http.CloseNotifier func (rl *respLogger) CloseNotify() <-chan bool { + //lint:ignore SA1019 There are places in the code base requiring the CloseNotifier interface to be implemented. return rl.w.(http.CloseNotifier).CloseNotify() }