Resolve lint warnings for golangci-lint v1.64.2

Signed-off-by: Austin Vazquez <[email protected]>

Author: austinvazquez

.golangci.yml

@@ -5,8 +5,8 @@ linters:
   disable-all: true
   enable:
     - govet
+    - copyloopvar
     - staticcheck
-#    - unused
     - gosimple
     - ineffassign
     - typecheck
@@ -19,15 +19,29 @@ linters:
     - gocritic
     - gofmt
     - revive
-    - exportloopref
 
 issues:
   exclude-use-default: false
   exclude:
     - G104 # Errors unhandled
     - G103 # Use of unsafe calls should be audited
+    - G114 # Use of net/http serve function without timeouts.
+    - G115 # Integer overflow conversion should be audited
     - G204 # Subprocess launched with variable
+    - G301 # Expect directory permissions to be 0750 or less
     - G304 # Potential file inclusion via variable
     - G306 # WriteFile permissions 0600 or less to be audited
     - G307 # Deferring unsafe method "Close" on type "*os.File" to be audited
-    - 
+    - G404 # Use of weak random number generator
+  exclude-rules:
+    - linters:
+      - govet
+      text: "copylocks"
+    - linters:
+      - revive
+      text: package-comments
+    - linters:
+      - staticcheck
+      text: "Do not rely on the global seed"
+  exclude-dirs:
+    - snapshotter/internal/integtest/stargz # Code copied from upstream stargz

agent/drive_handler.go

@@ -21,9 +21,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/protobuf/types"
+	"github.com/containerd/log"
 	"github.com/firecracker-microvm/firecracker-containerd/internal"
 	drivemount "github.com/firecracker-microvm/firecracker-containerd/proto/service/drivemount/ttrpc"
 )
@@ -214,7 +214,7 @@ func (dh driveHandler) MountDrive(ctx context.Context, req *drivemount.MountDriv
 	return nil, fmt.Errorf("exhausted retries mounting drive from %q to %q", drive.Path(), req.DestinationPath)
 }
 
-func (dh driveHandler) UnmountDrive(ctx context.Context, req *drivemount.UnmountDriveRequest) (*types.Empty, error) {
+func (dh driveHandler) UnmountDrive(_ context.Context, req *drivemount.UnmountDriveRequest) (*types.Empty, error) {
 	drive, ok := dh.GetDrive(req.DriveID)
 	if !ok {
 		return nil, fmt.Errorf("drive %q could not be found", req.DriveID)

agent/error_test.go

@@ -55,7 +55,6 @@ func TestIsRetryableMountError(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		c := c // see https://github.com/kyoh86/scopelint/issues/4
 		t.Run(c.Name, func(t *testing.T) {
 			assert.Equal(t, c.Expected, isRetryableMountError(c.Error))
 		})

agent/ioproxy_handler.go

@@ -17,8 +17,8 @@ import (
 	"context"
 
 	task "github.com/containerd/containerd/api/runtime/task/v2"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/protobuf/types"
+	"github.com/containerd/log"
 	"github.com/firecracker-microvm/firecracker-containerd/internal/vm"
 	ioproxy "github.com/firecracker-microvm/firecracker-containerd/proto/service/ioproxy/ttrpc"
 )

agent/main.go

@@ -23,9 +23,9 @@ import (
 
 	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/events/exchange"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/sys/reaper"
+	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
 	"github.com/firecracker-microvm/firecracker-go-sdk/vsock"
 	"github.com/opencontainers/runc/libcontainer/system"

agent/service.go

@@ -25,11 +25,11 @@ import (
 	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/identifiers"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/protobuf/types"
 	runc "github.com/containerd/containerd/runtime/v2/runc/v2"
 	"github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/containerd/log"
 	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"

eventbridge/eventbridge.go

@@ -89,7 +89,7 @@ func (s *getterService) GetEvent(ctx context.Context) (*eventapi.Envelope, error
 // RegisterGetterService adds the Getter service as a method to the provided TTRPC server.
 func RegisterGetterService(srv *ttrpc.Server, svc Getter) {
 	srv.Register(getterServiceName, map[string]ttrpc.Method{
-		getEventMethodName: func(ctx context.Context, unmarshal func(interface{}) error) (interface{}, error) {
+		getEventMethodName: func(ctx context.Context, _ func(any) error) (any, error) {
 			return svc.GetEvent(ctx)
 		},
 	})

eventbridge/eventbridge_test.go

@@ -79,12 +79,13 @@ func verifyPublishAndReceive(ctx context.Context, t *testing.T, source eventtype
 	topic := "/just/container/things"
 	sinkEventCh, sinkErrorCh := sink.Subscribe(ctx, fmt.Sprintf(`topic=="%s"`, topic))
 
-	for i := 0; i < 100; i++ {
+	const taskLimit uint32 = 100
+	for i := range taskLimit {
 		taskExitEvent := &events.TaskExit{
 			ContainerID: fmt.Sprintf("container-%d", i),
 			ID:          fmt.Sprintf("id-%d", i),
-			Pid:         uint32(i),
-			ExitStatus:  uint32(i + 1),
+			Pid:         i,
+			ExitStatus:  i + 1,
 			ExitedAt:    protobuf.ToTimestamp(time.Now().UTC()),
 		}
 

examples/cmd/remote-snapshotter/go.mod

@@ -48,7 +48,7 @@ require (
 	golang.org/x/mod v0.18.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/tools v0.22.0 // indirect
 	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect

examples/cmd/remote-snapshotter/go.sum

@@ -1167,8 +1167,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=