From 706635ae80511e6f6bd6ea45ad9b3f97d6563104 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 9 Dec 2024 11:17:02 +0100 Subject: [PATCH] Update golangci-lint to v1.62.2 Signed-off-by: Sascha Grunert --- .golangci.yml | 2 ++ Makefile | 2 +- dependencies.yaml | 2 +- pkg/validate/networking.go | 2 +- pkg/validate/security_context_linux.go | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 87ede43ed7..9aee75863a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -47,6 +47,7 @@ linters: - gosmopolitan - govet - grouper + - iface - importas - inamedparam - ineffassign @@ -71,6 +72,7 @@ linters: - promlinter - protogetter - reassign + - recvcheck - revive - rowserrcheck - sloglint diff --git a/Makefile b/Makefile index 752e453b0d..49256d4730 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ define curl_to endef ZEITGEIST_VERSION = v0.5.3 -GOLANGCI_LINT_VERSION := v1.61.0 +GOLANGCI_LINT_VERSION := v1.62.2 REPO_INFRA_VERSION = v0.2.5 GINKGO := $(BUILD_BIN_PATH)/ginkgo diff --git a/dependencies.yaml b/dependencies.yaml index dcfdc3e5f5..d032cc8d24 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -27,7 +27,7 @@ dependencies: match: ZEITGEIST_VERSION - name: golangci-lint - version: v1.61.0 + version: v1.62.2 refPaths: - path: Makefile match: GOLANGCI_LINT_VERSION diff --git a/pkg/validate/networking.go b/pkg/validate/networking.go index b20ccfd5f1..d10f90f3ec 100644 --- a/pkg/validate/networking.go +++ b/pkg/validate/networking.go @@ -273,7 +273,7 @@ func checkMainPage(c internalapi.RuntimeService, podID string, hostPort, contain defer resp.Body.Close() respChan <- resp return nil - }, time.Minute, time.Second).Should(BeNil()) + }, time.Minute, time.Second).Should(Succeed()) resp := <-respChan Expect(resp.StatusCode).To(Equal(200), "The status code of response should be 200.") diff --git a/pkg/validate/security_context_linux.go b/pkg/validate/security_context_linux.go index 14ecbb5dd0..4681f8469e 100644 --- a/pkg/validate/security_context_linux.go +++ b/pkg/validate/security_context_linux.go @@ -1400,7 +1400,7 @@ func createAndCheckHostNetwork(rc internalapi.RuntimeService, ic internalapi.Ima return fmt.Errorf("host port %s should be in container's port list", hostNetworkPort) } return nil - }, time.Minute, time.Second).Should(BeNil()) + }, time.Minute, time.Second).Should(Succeed()) return podID, podLogDir }