diff --git a/.golangci.yml b/.golangci.yml index 3f04f1af10..56b551ca31 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -47,6 +47,7 @@ linters: - lll - gosec - maligned + - musttag # way to many warnings to fix for now, also some false positives - gomoddirectives - containedctx - contextcheck @@ -73,3 +74,13 @@ linters-settings: nolintlint: allow-leading-space: false require-specific: true + +issues: + # Maximum issues count per one linter. + # Set to 0 to disable. + # Default: 50 + max-issues-per-linter: 0 + # Maximum count of issues with the same text. + # Set to 0 to disable. + # Default: 3 + max-same-issues: 0 diff --git a/Makefile b/Makefile index be69c46d6b..cccaebe0d4 100644 --- a/Makefile +++ b/Makefile @@ -929,7 +929,7 @@ install.tools: .install.golangci-lint ## Install needed tools .PHONY: .install.golangci-lint .install.golangci-lint: - VERSION=1.50.1 ./hack/install_golangci.sh + VERSION=1.51.1 ./hack/install_golangci.sh .PHONY: .install.swagger .install.swagger: diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index b0872bf4cf..0b59d87f19 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -91,7 +91,7 @@ func (e EventLogFile) writeString(s string) error { func (e EventLogFile) getTail(options ReadOptions) (*tail.Tail, error) { reopen := true - seek := tail.SeekInfo{Offset: 0, Whence: os.SEEK_END} + seek := tail.SeekInfo{Offset: 0, Whence: io.SeekEnd} if options.FromStart || !options.Stream { seek.Whence = 0 reopen = false diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index e32522ea87..d9bb63c204 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1702,10 +1702,10 @@ func testHTTPServer(port string, shouldErr bool, expectedResponse string) { time.Sleep(interval) interval *= 2 } - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) body, err := io.ReadAll(resp.Body) - Expect(err).To(BeNil()) + Expect(err).ToNot(HaveOccurred()) Expect(string(body)).Should(Equal(expectedResponse)) }