Add back the count checks in vms, volumes, snapshots to not break the CSI driver logic

Author: elivlo

pkg/cloud/snapshots.go

@@ -34,8 +34,12 @@ func (c *client) GetSnapshotByID(ctx context.Context, snapshotID string) (*Snaps
 		"id": snapshotID,
 	})
 
-	snapshot, _, err := c.Snapshot.GetSnapshotByID(snapshotID)
+	snapshot, count, err := c.Snapshot.GetSnapshotByID(snapshotID)
 	if err != nil {
+		if count == 0 {
+			return nil, ErrNotFound
+		}
+
 		return nil, err
 	}
 
@@ -91,8 +95,12 @@ func (c *client) GetSnapshotByName(ctx context.Context, name string) (*Snapshot,
 	logger.V(2).Info("CloudStack API call", "command", "GetSnapshotByName", "params", map[string]string{
 		"name": name,
 	})
-	snapshot, _, err := c.Snapshot.GetSnapshotByName(name)
+	snapshot, count, err := c.Snapshot.GetSnapshotByName(name)
 	if err != nil {
+		if count == 0 {
+			return nil, ErrNotFound
+		}
+
 		return nil, err
 	}
 

pkg/cloud/vms.go

@@ -31,8 +31,12 @@ func (c *client) GetVMByID(ctx context.Context, vmID string) (*VM, error) {
 		"id": vmID,
 	})
 
-	vm, _, err := c.VirtualMachine.GetVirtualMachineByID(vmID)
+	vm, count, err := c.VirtualMachine.GetVirtualMachineByID(vmID)
 	if err != nil {
+		if count == 0 {
+			return nil, ErrNotFound
+		}
+
 		return nil, err
 	}
 
@@ -48,8 +52,12 @@ func (c *client) getVMByName(ctx context.Context, name string) (*VM, error) {
 		"name": name,
 	})
 
-	vm, _, err := c.VirtualMachine.GetVirtualMachineByName(name)
+	vm, count, err := c.VirtualMachine.GetVirtualMachineByName(name)
 	if err != nil {
+		if count == 0 {
+			return nil, ErrNotFound
+		}
+
 		return nil, err
 	}
 

pkg/cloud/volumes.go

@@ -51,8 +51,12 @@ func (c *client) GetVolumeByID(ctx context.Context, volumeID string) (*Volume, e
 		"id": volumeID,
 	})
 
-	volume, _, err := c.Volume.GetVolumeByID(volumeID)
+	volume, count, err := c.Volume.GetVolumeByID(volumeID)
 	if err != nil {
+		if count == 0 {
+			return nil, ErrNotFound
+		}
+
 		return nil, err
 	}
 
@@ -67,8 +71,12 @@ func (c *client) GetVolumeByName(ctx context.Context, name string) (*Volume, err
 		"name": name,
 	})
 
-	volume, _, err := c.Volume.GetVolumeByName(name)
+	volume, count, err := c.Volume.GetVolumeByName(name)
 	if err != nil {
+		if count == 0 {
+			return nil, ErrNotFound
+		}
+
 		return nil, err
 	}