Update Golanglint

leaseweb · Jan 30, 2025 · 30f5c11 · 30f5c11
1 parent eee35be
commit 30f5c11
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
@@ -8,26 +8,26 @@ jobs:
     name: Lint
     runs-on: ubuntu-24.04
     steps:
-      - name: Setup up Go 1.22
+      - name: Setup up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Check out code
         uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.58.2
+          version: v1.63.4
           args: --timeout=5m
 
   build:
     name: Test & Build
     runs-on: ubuntu-24.04
     steps:
-      - name: Setup up Go 1.22
+      - name: Setup up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -56,7 +56,7 @@ func NewControllerService(connector cloud.Cloud) *ControllerService {
 
 func (cs *ControllerService) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("CreateVolume: called", "args", *req)
+	logger.V(4).Info("CreateVolume: called", "args", req)
 
 	// Check arguments.
 
@@ -236,7 +236,7 @@ func determineSize(req *csi.CreateVolumeRequest) (int64, error) {
 
 func (cs *ControllerService) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("DeleteVolume: called", "args", *req)
+	logger.V(4).Info("DeleteVolume: called", "args", req)
 
 	if req.GetVolumeId() == "" {
 		return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")
@@ -271,7 +271,7 @@ func (cs *ControllerService) DeleteVolume(ctx context.Context, req *csi.DeleteVo
 
 func (cs *ControllerService) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.ControllerPublishVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("ControllerPublishVolume: called", "args", *req)
+	logger.V(4).Info("ControllerPublishVolume: called", "args", req)
 
 	// Check arguments.
 
@@ -374,7 +374,7 @@ func (cs *ControllerService) ControllerPublishVolume(ctx context.Context, req *c
 
 func (cs *ControllerService) ControllerUnpublishVolume(ctx context.Context, req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("ControllerUnpublishVolume: called", "args", *req)
+	logger.V(4).Info("ControllerUnpublishVolume: called", "args", req)
 
 	// Check arguments.
 
@@ -436,7 +436,7 @@ func (cs *ControllerService) ControllerUnpublishVolume(ctx context.Context, req
 
 func (cs *ControllerService) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("ValidateVolumeCapabilities: called", "args", *req)
+	logger.V(4).Info("ValidateVolumeCapabilities: called", "args", req)
 
 	volumeID := req.GetVolumeId()
 	if len(volumeID) == 0 {
@@ -480,7 +480,7 @@ func isValidVolumeCapabilities(volCaps []*csi.VolumeCapability) bool {
 
 func (cs *ControllerService) ControllerExpandVolume(ctx context.Context, req *csi.ControllerExpandVolumeRequest) (*csi.ControllerExpandVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("ControllerExpandVolume: called", "args", protosanitizer.StripSecrets(*req))
+	logger.V(4).Info("ControllerExpandVolume: called", "args", protosanitizer.StripSecrets(req))
 
 	volumeID := req.GetVolumeId()
 	if len(volumeID) == 0 {
@@ -548,7 +548,7 @@ func (cs *ControllerService) ControllerExpandVolume(ctx context.Context, req *cs
 
 func (cs *ControllerService) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("ControllerGetCapabilities: called", "args", protosanitizer.StripSecrets(*req))
+	logger.V(4).Info("ControllerGetCapabilities: called", "args", protosanitizer.StripSecrets(req))
 
 	resp := &csi.ControllerGetCapabilitiesResponse{
 		Capabilities: []*csi.ControllerServiceCapability{

diff --git a/pkg/driver/identity.go b/pkg/driver/identity.go
@@ -9,7 +9,7 @@ import (
 
 func (d *Driver) GetPluginInfo(ctx context.Context, req *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(6).Info("GetPluginInfo: called", "args", *req)
+	logger.V(6).Info("GetPluginInfo: called", "args", req)
 	resp := &csi.GetPluginInfoResponse{
 		Name:          DriverName,
 		VendorVersion: driverVersion,
@@ -20,14 +20,14 @@ func (d *Driver) GetPluginInfo(ctx context.Context, req *csi.GetPluginInfoReques
 
 func (d *Driver) Probe(ctx context.Context, req *csi.ProbeRequest) (*csi.ProbeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(6).Info("Probe: called", "args", *req)
+	logger.V(6).Info("Probe: called", "args", req)
 
 	return &csi.ProbeResponse{}, nil
 }
 
 func (d *Driver) GetPluginCapabilities(ctx context.Context, req *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(6).Info("Probe: called", "args", *req)
+	logger.V(6).Info("Probe: called", "args", req)
 
 	resp := &csi.GetPluginCapabilitiesResponse{
 		Capabilities: []*csi.PluginCapability{

diff --git a/pkg/driver/node.go b/pkg/driver/node.go
@@ -57,7 +57,7 @@ func NewNodeService(connector cloud.Cloud, mounter mount.Mounter, options *Optio
 
 func (ns *NodeService) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodeStageVolume: called", "args", *req)
+	logger.V(4).Info("NodeStageVolume: called", "args", req)
 
 	// Check parameters
 
@@ -184,7 +184,7 @@ func (ns *NodeService) NodeStageVolume(ctx context.Context, req *csi.NodeStageVo
 
 func (ns *NodeService) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodeUnstageVolume: called", "args", *req)
+	logger.V(4).Info("NodeUnstageVolume: called", "args", req)
 
 	// Check parameters
 	volumeID := req.GetVolumeId()
@@ -245,7 +245,7 @@ func (ns *NodeService) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnsta
 
 func (ns *NodeService) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodePublishVolume: called", "args", *req)
+	logger.V(4).Info("NodePublishVolume: called", "args", req)
 
 	// Check arguments
 	volumeID := req.GetVolumeId()
@@ -301,7 +301,7 @@ func (ns *NodeService) NodePublishVolume(ctx context.Context, req *csi.NodePubli
 
 func (ns *NodeService) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodeUnpublishVolume: called", "args", *req)
+	logger.V(4).Info("NodeUnpublishVolume: called", "args", req)
 
 	volumeID := req.GetVolumeId()
 	if volumeID == "" {
@@ -335,7 +335,7 @@ func (ns *NodeService) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnp
 
 func (ns *NodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodeGetInfo: called", "args", *req)
+	logger.V(4).Info("NodeGetInfo: called", "args", req)
 
 	if ns.nodeName == "" {
 		return nil, status.Error(codes.Internal, "Missing node name")
@@ -363,7 +363,7 @@ func (ns *NodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequ
 
 func (ns *NodeService) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodeExpandVolume: called", "args", *req)
+	logger.V(4).Info("NodeExpandVolume: called", "args", req)
 
 	volumeID := req.GetVolumeId()
 	if len(volumeID) == 0 {
@@ -454,7 +454,7 @@ func (ns *NodeService) NodeExpandVolume(ctx context.Context, req *csi.NodeExpand
 
 func (ns *NodeService) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {
 	logger := klog.FromContext(ctx)
-	logger.V(4).Info("NodeGetVolumeStats: called", "args", *req)
+	logger.V(4).Info("NodeGetVolumeStats: called", "args", req)
 
 	if req.GetVolumeId() == "" {
 		return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")

diff --git a/pkg/mount/mount.go b/pkg/mount/mount.go
@@ -244,13 +244,13 @@ func (m *NodeMounter) GetStatistics(volumePath string) (VolumeStatistics, error)
 	}
 
 	volStats := VolumeStatistics{
-		AvailableBytes: int64(statfs.Bavail) * int64(statfs.Bsize),                         //nolint:unconvert
-		TotalBytes:     int64(statfs.Blocks) * int64(statfs.Bsize),                         //nolint:unconvert
-		UsedBytes:      (int64(statfs.Blocks) - int64(statfs.Bfree)) * int64(statfs.Bsize), //nolint:unconvert
+		AvailableBytes: int64(statfs.Bavail) * int64(statfs.Bsize),                         //nolint:unconvert,gosec,nolintlint
+		TotalBytes:     int64(statfs.Blocks) * int64(statfs.Bsize),                         //nolint:unconvert,gosec,nolintlint
+		UsedBytes:      (int64(statfs.Blocks) - int64(statfs.Bfree)) * int64(statfs.Bsize), //nolint:unconvert,gosec,nolintlint
 
-		AvailableInodes: int64(statfs.Ffree),
-		TotalInodes:     int64(statfs.Files),
-		UsedInodes:      int64(statfs.Files) - int64(statfs.Ffree),
+		AvailableInodes: int64(statfs.Ffree),                       //nolint:gosec
+		TotalInodes:     int64(statfs.Files),                       //nolint:gosec
+		UsedInodes:      int64(statfs.Files) - int64(statfs.Ffree), //nolint:gosec
 	}
 
 	return volStats, nil