Update golangci-lint to v1.62.0

saschagrunert · saschagrunert · commit 19ac18b4e8d5 · 2024-11-18T11:06:11.000+01:00
Signed-off-by: Sascha Grunert &lt;sgrunert@redhat.com&gt;
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -11,7 +11,7 @@ on:
   pull_request:
 env:
   GO_VERSION: "1.23"
-  GOLANGCI_LINT_VERSION: v1.61.0
+  GOLANGCI_LINT_VERSION: v1.62.0
 permissions:
   contents: read
 
diff --git a/.golangci.yml b/.golangci.yml
@@ -52,6 +52,7 @@ linters:
     - gosmopolitan
     - govet
     - grouper
+    - iface
     - importas
     - ineffassign
     - intrange
@@ -69,6 +70,7 @@ linters:
     - promlinter
     - protogetter
     - reassign
+    - recvcheck
     - revive
     - rowserrcheck
     - sloglint
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ GO_MD2MAN ?= ${BUILD_BIN_PATH}/go-md2man
 GINKGO := ${BUILD_BIN_PATH}/ginkgo
 MOCKGEN := ${BUILD_BIN_PATH}/mockgen
 GOLANGCI_LINT := ${BUILD_BIN_PATH}/golangci-lint
-GOLANGCI_LINT_VERSION := v1.61.0
+GOLANGCI_LINT_VERSION := v1.62.0
 GO_MOD_OUTDATED := ${BUILD_BIN_PATH}/go-mod-outdated
 GO_MOD_OUTDATED_VERSION := 0.9.0
 GOSEC := ${BUILD_BIN_PATH}/gosec
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -18,7 +18,7 @@ dependencies:
         match: buildGo123Module
 
   - name: golangci-lint
-    version: v1.61.0
+    version: v1.62.0
     refPaths:
       - path: .github/workflows/verify.yml
         match: GOLANGCI_LINT_VERSION
diff --git a/internal/runtimehandlerhooks/runtime_handler_hooks.go b/internal/runtimehandlerhooks/runtime_handler_hooks.go
@@ -15,13 +15,15 @@ var (
 	cpuLoadBalancingAllowedAnywhere     bool
 )
 
+//nolint:iface // interface duplication is intentional
 type RuntimeHandlerHooks interface {
 	PreCreate(ctx context.Context, specgen *generate.Generator, s *sandbox.Sandbox, c *oci.Container) error
 	PreStart(ctx context.Context, c *oci.Container, s *sandbox.Sandbox) error
 	PreStop(ctx context.Context, c *oci.Container, s *sandbox.Sandbox) error
 	PostStop(ctx context.Context, c *oci.Container, s *sandbox.Sandbox) error
 }
 
+//nolint:iface // interface duplication is intentional
 type HighPerformanceHook interface {
 	RuntimeHandlerHooks
 }
diff --git a/server/container_attach.go b/server/container_attach.go
@@ -25,7 +25,7 @@ func (s *Server) Attach(ctx context.Context, req *types.AttachRequest) (*types.A
 }
 
 // Attach endpoint for streaming.Runtime.
-func (s StreamService) Attach(ctx context.Context, containerID string, inputStream io.Reader, outputStream, errorStream io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {
+func (s *StreamService) Attach(ctx context.Context, containerID string, inputStream io.Reader, outputStream, errorStream io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {
 	ctx, span := log.StartSpan(ctx)
 	defer span.End()
 	c, err := s.runtimeServer.GetContainerFromShortID(ctx, containerID)
diff --git a/server/container_exec.go b/server/container_exec.go
@@ -26,7 +26,7 @@ func (s *Server) Exec(ctx context.Context, req *types.ExecRequest) (*types.ExecR
 }
 
 // Exec endpoint for streaming.Runtime.
-func (s StreamService) Exec(ctx context.Context, containerID string, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {
+func (s *StreamService) Exec(ctx context.Context, containerID string, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {
 	ctx, span := log.StartSpan(ctx)
 	defer span.End()
 	c, err := s.runtimeServer.GetContainerFromShortID(ctx, containerID)
diff --git a/server/container_portforward.go b/server/container_portforward.go
@@ -22,7 +22,7 @@ func (s *Server) PortForward(ctx context.Context, req *types.PortForwardRequest)
 	return resp, nil
 }
 
-func (s StreamService) PortForward(ctx context.Context, podSandboxID string, port int32, stream io.ReadWriteCloser) error {
+func (s *StreamService) PortForward(ctx context.Context, podSandboxID string, port int32, stream io.ReadWriteCloser) error {
 	ctx, span := log.StartSpan(ctx)
 	defer span.End()
 
diff --git a/server/server.go b/server/server.go
@@ -64,7 +64,7 @@ type StreamService struct {
 // Server implements the RuntimeService and ImageService.
 type Server struct {
 	config          libconfig.Config
-	stream          StreamService
+	stream          *StreamService
 	hostportManager hostport.HostPortManager
 
 	*lib.ContainerServer
@@ -405,6 +405,7 @@ func New(
 		ContainerServer:          containerServer,
 		hostportManager:          hostportManager,
 		config:                   *config,
+		stream:                   &StreamService{},
 		monitorsChan:             make(chan struct{}),
 		defaultIDMappings:        idMappings,
 		minimumMappableUID:       config.MinimumMappableUID,
diff --git a/server/suite_test.go b/server/suite_test.go
@@ -53,7 +53,7 @@ var (
 	testManifest      []byte
 	testPath          string
 	testSandbox       *sandbox.Sandbox
-	testStreamService server.StreamService
+	testStreamService *server.StreamService
 
 	emptyDir string
 )
@@ -171,7 +171,7 @@ var beforeEach = func() {
 
 	// Initialize test streaming server
 	streamServerConfig := streaming.DefaultConfig
-	testStreamService = server.StreamService{}
+	testStreamService = &server.StreamService{}
 	testStreamService.SetRuntimeServer(sut)
 	server, err := streaming.NewServer(streamServerConfig, testStreamService)
 	Expect(err).ToNot(HaveOccurred())

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,15 @@ var (`
`15`	`15`	`cpuLoadBalancingAllowedAnywhere bool`
`16`	`16`	`)`
`17`	`17`
	`18`	`+//nolint:iface // interface duplication is intentional`
`18`	`19`	`type RuntimeHandlerHooks interface {`
`19`	`20`	`PreCreate(ctx context.Context, specgen generate.Generator, s sandbox.Sandbox, c *oci.Container) error`
`20`	`21`	`PreStart(ctx context.Context, c oci.Container, s sandbox.Sandbox) error`
`21`	`22`	`PreStop(ctx context.Context, c oci.Container, s sandbox.Sandbox) error`
`22`	`23`	`PostStop(ctx context.Context, c oci.Container, s sandbox.Sandbox) error`
`23`	`24`	`}`
`24`	`25`
	`26`	`+//nolint:iface // interface duplication is intentional`
`25`	`27`	`type HighPerformanceHook interface {`
`26`	`28`	`RuntimeHandlerHooks`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (s Server) Attach(ctx context.Context, req types.AttachRequest) (*types.A`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// Attach endpoint for streaming.Runtime.`
`28`		`-func (s StreamService) Attach(ctx context.Context, containerID string, inputStream io.Reader, outputStream, errorStream io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {`
	`28`	`+func (s *StreamService) Attach(ctx context.Context, containerID string, inputStream io.Reader, outputStream, errorStream io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {`
`29`	`29`	`ctx, span := log.StartSpan(ctx)`
`30`	`30`	`defer span.End()`
`31`	`31`	`c, err := s.runtimeServer.GetContainerFromShortID(ctx, containerID)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (s Server) Exec(ctx context.Context, req types.ExecRequest) (*types.ExecR`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// Exec endpoint for streaming.Runtime.`
`29`		`-func (s StreamService) Exec(ctx context.Context, containerID string, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {`
	`29`	`+func (s *StreamService) Exec(ctx context.Context, containerID string, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {`
`30`	`30`	`ctx, span := log.StartSpan(ctx)`
`31`	`31`	`defer span.End()`
`32`	`32`	`c, err := s.runtimeServer.GetContainerFromShortID(ctx, containerID)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (s Server) PortForward(ctx context.Context, req types.PortForwardRequest)`
`22`	`22`	`return resp, nil`
`23`	`23`	`}`
`24`	`24`
`25`		`-func (s StreamService) PortForward(ctx context.Context, podSandboxID string, port int32, stream io.ReadWriteCloser) error {`
	`25`	`+func (s *StreamService) PortForward(ctx context.Context, podSandboxID string, port int32, stream io.ReadWriteCloser) error {`
`26`	`26`	`ctx, span := log.StartSpan(ctx)`
`27`	`27`	`defer span.End()`
`28`	`28`