Merge pull request #1795 from saschagrunert/golangci-lint

Update golangci-lint to v1.55.0

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54.2
+          version: v1.55.0
           only-new-issues: true
 
   get-script:

.golangci.yml

@@ -96,6 +96,12 @@ linters:
     - whitespace
     - wrapcheck
     - zerologlint
+    - gochecksumtype
+    - inamedparam
+    - perfsprint
+    - protogetter
+    - sloglint
+    - testifylint
     # - depguard
     # - exhaustruct
     # - gochecknoglobals
@@ -119,6 +125,10 @@ linters-settings:
   errcheck:
     check-type-assertions: true
     check-blank: true
+  revive:
+    rules:
+      - name: dot-imports
+        disabled: true
   godox:
     keywords:
       - BUG

Makefile

@@ -10,7 +10,7 @@ TEST_FLAGS ?=
 PACKAGE_NAME ?= $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[2] | [ .name, .version ] | join("-v")')
 PREFIX ?= /usr
 CI_TAG ?=
-GOLANGCI_LINT_VERSION := v1.54.2
+GOLANGCI_LINT_VERSION := v1.55.0
 ZEITGEIST_VERSION := v0.4.1
 GINKGO_VERSION := v2.13.0
 

dependencies.yaml

@@ -19,7 +19,7 @@ dependencies:
         match: ACTION_MSRV_TOOLCHAIN
 
   - name: golangci-lint
-    version: 1.54.2
+    version: 1.55.0
     refPaths:
       - path: .github/workflows/ci.yml
         match: version

pkg/client/client.go

@@ -601,7 +601,7 @@ func (c *ConmonClient) Version(
 func (c *ConmonClient) setCgroupManager(
 	cfg CgroupManager,
 	req interface {
-		SetCgroupManager(proto.Conmon_CgroupManager)
+		SetCgroupManager(manager proto.Conmon_CgroupManager)
 	},
 ) {
 	cgroupManager := c.cgroupManager

pkg/client/client_test.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -278,7 +279,7 @@ var _ = Describe("ConmonClient", func() {
 						defer wg.Done()
 						result, err := sut.ExecSyncContainer(context.Background(), &client.ExecSyncConfig{
 							ID:       tr.ctrID,
-							Command:  []string{"/busybox", "echo", "-n", "hello", "world", fmt.Sprintf("%d", i)},
+							Command:  []string{"/busybox", "echo", "-n", "hello", "world", strconv.Itoa(i)},
 							Terminal: terminal,
 							Timeout:  timeoutUnlimited,
 						})
@@ -305,7 +306,7 @@ var _ = Describe("ConmonClient", func() {
 				for i := 0; i < 25; i++ {
 					result, err := sut.ExecSyncContainer(context.Background(), &client.ExecSyncConfig{
 						ID:       tr.ctrID,
-						Command:  []string{"/busybox", "echo", "-n", "hello", "world", fmt.Sprintf("%d", i)},
+						Command:  []string{"/busybox", "echo", "-n", "hello", "world", strconv.Itoa(i)},
 						Terminal: terminal,
 						Timeout:  timeoutUnlimited,
 					})

pkg/client/suite_test.go

@@ -163,7 +163,7 @@ func (tr *testRunner) createContainer(sut *client.ConmonClient, terminal bool) {
 func (tr *testRunner) createContainerWithConfig(sut *client.ConmonClient, cfg *client.CreateContainerConfig) {
 	resp, err := sut.CreateContainer(context.Background(), cfg)
 	Expect(err).To(Succeed())
-	Expect(resp.PID).NotTo(Equal(0))
+	Expect(resp.PID).NotTo(BeEquivalentTo(0))
 	Eventually(func() error {
 		return tr.rr.RunCommandCheckOutput(tr.ctrID, "list")
 	}, time.Second*5).Should(Succeed())