fix lint

Author: Pearl1594

pkg/cloud/cloud.go

@@ -10,6 +10,8 @@ import (
 )
 
 // Interface is the CloudStack client interface.
+//
+//revive:disable:interfacebloat
 type Interface interface {
 	GetNodeInfo(ctx context.Context, vmName string) (*VM, error)
 	GetVMByID(ctx context.Context, vmID string) (*VM, error)

pkg/cloud/fake/fake.go

@@ -139,7 +139,7 @@ func (f *fakeConnector) ExpandVolume(_ context.Context, volumeID string, newSize
 	return cloud.ErrNotFound
 }
 
-func (f *fakeConnector) CreateVolumeFromSnapshot(_ context.Context, zoneID, name, _, snapshotID string, sizeInGB int64) (*cloud.Volume, error) {
+func (f *fakeConnector) CreateVolumeFromSnapshot(_ context.Context, zoneID, name, _, _ string, sizeInGB int64) (*cloud.Volume, error) {
 	vol := &cloud.Volume{
 		ID:             "fake-vol-from-snap-" + name,
 		Name:           name,
@@ -149,6 +149,7 @@ func (f *fakeConnector) CreateVolumeFromSnapshot(_ context.Context, zoneID, name
 	}
 	f.volumesByID[vol.ID] = *vol
 	f.volumesByName[vol.Name] = *vol
+
 	return vol, nil
 }
 
@@ -161,6 +162,7 @@ func (f *fakeConnector) CreateSnapshot(_ context.Context, volumeID, name string)
 			// Allow multiple snapshots with the same name for the same volume
 			continue
 		}
+
 		// Name conflict: same name, different volume
 		return nil, cloud.ErrAlreadyExists
 	}
@@ -175,6 +177,7 @@ func (f *fakeConnector) CreateSnapshot(_ context.Context, volumeID, name string)
 	}
 	f.snapshotsByID[newSnap.ID] = newSnap
 	f.snapshotsByName[name] = append(f.snapshotsByName[name], newSnap)
+
 	return newSnap, nil
 }
 
@@ -183,6 +186,7 @@ func (f *fakeConnector) GetSnapshotByID(_ context.Context, snapshotID string) (*
 	if ok {
 		return snap, nil
 	}
+
 	return nil, cloud.ErrNotFound
 }
 
@@ -194,6 +198,7 @@ func (f *fakeConnector) GetSnapshotByName(_ context.Context, name string) (*clou
 	if ok && len(snaps) > 0 {
 		return snaps[0], nil // Return the first for compatibility
 	}
+
 	return nil, cloud.ErrNotFound
 }
 
@@ -204,6 +209,7 @@ func (f *fakeConnector) ListSnapshots(_ context.Context, volumeID, snapshotID st
 		if snap, ok := f.snapshotsByID[snapshotID]; ok {
 			result = append(result, snap)
 		}
+
 		return result, nil
 	}
 	if volumeID != "" {
@@ -212,11 +218,13 @@ func (f *fakeConnector) ListSnapshots(_ context.Context, volumeID, snapshotID st
 				result = append(result, snap)
 			}
 		}
+
 		return result, nil
 	}
 	for _, snap := range f.snapshotsByID {
 		result = append(result, snap)
 	}
+
 	return result, nil
 }
 
@@ -225,9 +233,9 @@ func (f *fakeConnector) DeleteSnapshot(_ context.Context, snapshotID string) err
 	if !ok {
 		return cloud.ErrNotFound
 	}
-	// Remove from snapshotsByID
+
 	delete(f.snapshotsByID, snapshotID)
-	// Remove from snapshotsByName
+
 	name := snap.Name
 	snaps := f.snapshotsByName[name]
 	for i, s := range snaps {
@@ -236,5 +244,6 @@ func (f *fakeConnector) DeleteSnapshot(_ context.Context, snapshotID string) err
 			break
 		}
 	}
+
 	return nil
 }

pkg/cloud/snapshots.go

@@ -71,6 +71,7 @@ func (c *client) CreateSnapshot(ctx context.Context, volumeID, name string) (*Sn
 		VolumeID:  snapshot.Volumeid,
 		CreatedAt: snapshot.Created,
 	}
+
 	return &snap, nil
 }
 
@@ -160,5 +161,6 @@ func (c *client) ListSnapshots(ctx context.Context, volumeID, snapshotID string)
 		}
 		result = append(result, s)
 	}
+
 	return result, nil
 }

pkg/cloud/vms.go

@@ -29,6 +29,7 @@ func (c *client) GetVMByID(ctx context.Context, vmID string) (*VM, error) {
 	}
 	vm := l.VirtualMachines[0]
 	logger.V(2).Info("Returning VM", "vmID", vm.Id, "zoneID", vm.Zoneid)
+
 	return &VM{
 		ID:     vm.Id,
 		ZoneID: vm.Zoneid,

pkg/driver/controller.go

@@ -166,6 +166,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 				},
 			},
 		}
+
 		return resp, nil
 	}
 
@@ -226,6 +227,7 @@ func printVolumeAsJSON(vol *csi.CreateVolumeRequest) {
 	b, err := json.MarshalIndent(vol, "", "  ")
 	if err != nil {
 		klog.Errorf("Failed to marshal CreateVolumeRequest to JSON: %v", err)
+
 		return
 	}
 	klog.V(5).Infof("CreateVolumeRequest as JSON:\n%s", string(b))
@@ -347,8 +349,10 @@ func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
 		if errors.Is(err, cloud.ErrNotFound) {
 			return nil, status.Errorf(codes.NotFound, "Volume %v not found", volumeID)
 		}
+
 		return nil, status.Errorf(codes.Internal, "Error %v", err)
 	}
+
 	klog.V(4).Infof("CreateSnapshot of volume: %s", volume.ID)
 	snapshot, err := cs.connector.CreateSnapshot(ctx, volume.ID, req.GetName())
 	if errors.Is(err, cloud.ErrAlreadyExists) {
@@ -372,6 +376,7 @@ func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
 			ReadyToUse:     true,
 		},
 	}
+
 	return resp, nil
 }
 
@@ -385,14 +390,14 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap
 
 	// Pagination logic
 	start := 0
-	if req.StartingToken != "" {
+	if req.GetStartingToken() != "" {
 		var err error
-		start, err = strconv.Atoi(req.StartingToken)
+		start, err = strconv.Atoi(req.GetStartingToken())
 		if err != nil || start < 0 || start > len(snapshots) {
 			return nil, status.Error(codes.Aborted, "Invalid startingToken")
 		}
 	}
-	maxEntries := int(req.MaxEntries)
+	maxEntries := int(req.GetMaxEntries())
 	end := len(snapshots)
 	if maxEntries > 0 && start+maxEntries < end {
 		end = start + maxEntries
@@ -416,6 +421,7 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap
 		}
 		entries = append(entries, entry)
 	}
+
 	return &csi.ListSnapshotsResponse{Entries: entries, NextToken: nextToken}, nil
 }
 

pkg/mount/mount.go

@@ -95,6 +95,7 @@ func (m *mounter) GetDevicePath(ctx context.Context, volumeID string) (string, e
 		if path != "" {
 			devicePath = path
 			logger.V(4).Info("Device path found", "volumeID", volumeID, "devicePath", path)
+
 			return true, nil
 		}
 		m.probeVolume(ctx)
@@ -142,6 +143,7 @@ func (m *mounter) getDevicePathBySerialID(ctx context.Context, volumeID string)
 		}
 		if !os.IsNotExist(err) {
 			logger.Error(err, "Failed to stat device path", "path", source)
+
 			return "", err
 		}
 	}
@@ -161,11 +163,13 @@ func (m *mounter) getDevicePathForXenServer(ctx context.Context, volumeID string
 			if err == nil && isBlock {
 				if m.verifyDevice(ctx, devicePath, volumeID) {
 					logger.V(4).Info("Found and verified XenServer device", "devicePath", devicePath, "volumeID", volumeID)
+
 					return devicePath, nil
 				}
 			}
 		}
 	}
+
 	return "", fmt.Errorf("device not found for volume %s", volumeID)
 }