Merge pull request #20 from Leaseweb/fix_detach

revert passing vmID to DetachVolume

Author: hrak

pkg/cloud/cloud.go

@@ -21,7 +21,7 @@ type Interface interface {
 	CreateVolume(ctx context.Context, diskOfferingID, zoneID, name string, sizeInGB int64) (string, error)
 	DeleteVolume(ctx context.Context, id string) error
 	AttachVolume(ctx context.Context, volumeID, vmID string) (string, error)
-	DetachVolume(ctx context.Context, volumeID string, vmID string) error
+	DetachVolume(ctx context.Context, volumeID string) error
 }
 
 // Volume represents a CloudStack volume.

pkg/cloud/fake/fake.go

@@ -100,6 +100,6 @@ func (f *fakeConnector) AttachVolume(ctx context.Context, volumeID, vmID string)
 	return "1", nil
 }
 
-func (f *fakeConnector) DetachVolume(ctx context.Context, volumeID string, vmID string) error {
+func (f *fakeConnector) DetachVolume(ctx context.Context, volumeID string) error {
 	return nil
 }

pkg/cloud/volumes.go

@@ -111,15 +111,11 @@ func (c *client) AttachVolume(ctx context.Context, volumeID, vmID string) (strin
 	return strconv.FormatInt(r.Deviceid, 10), nil
 }
 
-func (c *client) DetachVolume(ctx context.Context, volumeID string, vmID string) error {
+func (c *client) DetachVolume(ctx context.Context, volumeID string) error {
 	p := c.Volume.NewDetachVolumeParams()
 	p.SetId(volumeID)
-	if vmID != "" {
-		p.SetVirtualmachineid(vmID)
-	}
 	ctxzap.Extract(ctx).Sugar().Infow("CloudStack API call", "command", "DetachVolume", "params", map[string]string{
-		"id":               volumeID,
-		"virtualmachineid": vmID,
+		"id": volumeID,
 	})
 	_, err := c.Volume.DetachVolume(p)
 	return err

pkg/driver/controller.go

@@ -308,7 +308,7 @@ func (cs *controllerServer) ControllerUnpublishVolume(ctx context.Context, req *
 		return nil, status.Errorf(codes.Internal, "Error %v", err)
 	}
 
-	err := cs.connector.DetachVolume(ctx, volumeID, nodeID)
+	err := cs.connector.DetachVolume(ctx, volumeID)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Cannot detach volume %s: %s", volumeID, err.Error())
 	}