driver: handle non existing volumes and nodes

CHANGELOG.md

@@ -5,6 +5,10 @@
 * Remove description to allow users to reuse volumes that were created by the
   UI/API
   [[GH-59]](https://github.com/digitalocean/csi-digitalocean/pull/59)
+* Handle edge cases from external action, such as Volume deletion via UI more
+  gracefully. We're not very strict anymore in cases we don't need to be, but
+  we're also returning a better error in cases we need to be.
+  [[GH-60]](https://github.com/digitalocean/csi-digitalocean/pull/60)
 
 ## v0.1.3 - August 3rd 2018
 

driver/controller.go

@@ -181,6 +181,22 @@ func (d *Driver) ControllerPublishVolume(ctx context.Context, req *csi.Controlle
 	})
 	ll.Info("controller publish volume called")
 
+	// check if volume exist before trying to attach it
+	_, resp, err := d.doClient.Storage.GetVolume(ctx, req.VolumeId)
+	if err != nil {
+		if resp != nil && resp.StatusCode == http.StatusNotFound {
+			return nil, status.Errorf(codes.NotFound, "volume %q not found", req.VolumeId)
+		}
+	}
+
+	// check if droplet exist before trying to attach the volume to the droplet
+	_, resp, err = d.doClient.Droplets.Get(ctx, dropletID)
+	if err != nil {
+		if resp != nil && resp.StatusCode == http.StatusNotFound {
+			return nil, status.Errorf(codes.NotFound, "droplet %q not found", dropletID)
+		}
+	}
+
 	action, resp, err := d.doClient.StorageActions.Attach(ctx, req.VolumeId, dropletID)
 	if err != nil {
 		// don't do anything if attached
@@ -224,6 +240,23 @@ func (d *Driver) ControllerUnpublishVolume(ctx context.Context, req *csi.Control
 	})
 	ll.Info("controller unpublish volume called")
 
+	// check if volume exist before trying to detach it
+	_, resp, err := d.doClient.Storage.GetVolume(ctx, req.VolumeId)
+	if err != nil {
+		if resp != nil && resp.StatusCode == http.StatusNotFound {
+			// assume it's detached
+			return &csi.ControllerUnpublishVolumeResponse{}, nil
+		}
+	}
+
+	// check if droplet exist before trying to detach the volume from the droplet
+	_, resp, err = d.doClient.Droplets.Get(ctx, dropletID)
+	if err != nil {
+		if resp != nil && resp.StatusCode == http.StatusNotFound {
+			return nil, status.Errorf(codes.NotFound, "droplet %q not found", dropletID)
+		}
+	}
+
 	action, resp, err := d.doClient.StorageActions.DetachByDropletID(ctx, req.VolumeId, dropletID)
 	if err != nil {
 		if (resp != nil && resp.StatusCode == http.StatusUnprocessableEntity) || strings.Contains(err.Error(), "Attachment not found") {
@@ -275,6 +308,14 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
 	})
 	ll.Info("validate volume capabilities called")
 
+	// check if volume exist before trying to validate it it
+	_, volResp, err := d.doClient.Storage.GetVolume(ctx, req.VolumeId)
+	if err != nil {
+		if volResp != nil && volResp.StatusCode == http.StatusNotFound {
+			return nil, status.Errorf(codes.NotFound, "volume %q not found", req.VolumeId)
+		}
+	}
+
 	hasSupport := func(mode csi.VolumeCapability_AccessMode_Mode) bool {
 		for _, m := range vcaps {
 			if mode == m.Mode {