Add List and Get for StorageActions for consistency with other resour…

…ces.

storage_actions.go

@@ -8,10 +8,12 @@ import "fmt"
 type StorageActionsService interface {
 	Attach(volumeID string, dropletID int) (*Action, *Response, error)
 	Detach(volumeID string) (*Action, *Response, error)
+	Get(volumeID string, actionID int) (*Action, *Response, error)
+	List(volumeID string, opt *ListOptions) ([]Action, *Response, error)
 	Resize(volumeID string, sizeGigabytes int, regionSlug string) (*Action, *Response, error)
 }
 
-// StorageActionsServiceOp handles communication with the floating IPs
+// StorageActionsServiceOp handles communication with the storage volumes
 // action related methods of the DigitalOcean API.
 type StorageActionsServiceOp struct {
 	client *Client
@@ -40,6 +42,23 @@ func (s *StorageActionsServiceOp) Detach(volumeID string) (*Action, *Response, e
 	return s.doAction(volumeID, request)
 }
 
+// Get an action for a particular storage volume by id.
+func (s *StorageActionsServiceOp) Get(volumeID string, actionID int) (*Action, *Response, error) {
+	path := fmt.Sprintf("%s/%d", storageAllocationActionPath(volumeID), actionID)
+	return s.get(path)
+}
+
+// List the actions for a particular storage volume.
+func (s *StorageActionsServiceOp) List(volumeID string, opt *ListOptions) ([]Action, *Response, error) {
+	path := storageAllocationActionPath(volumeID)
+	path, err := addOptions(path, opt)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return s.list(path)
+}
+
 // Resize a storage volume.
 func (s *StorageActionsServiceOp) Resize(volumeID string, sizeGigabytes int, regionSlug string) (*Action, *Response, error) {
 	request := &ActionRequest{
@@ -67,6 +86,39 @@ func (s *StorageActionsServiceOp) doAction(volumeID string, request *ActionReque
 	return &root.Event, resp, err
 }
 
+func (s *StorageActionsServiceOp) get(path string) (*Action, *Response, error) {
+	req, err := s.client.NewRequest("GET", path, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	root := new(actionRoot)
+	resp, err := s.client.Do(req, root)
+	if err != nil {
+		return nil, resp, err
+	}
+
+	return &root.Event, resp, err
+}
+
+func (s *StorageActionsServiceOp) list(path string) ([]Action, *Response, error) {
+	req, err := s.client.NewRequest("GET", path, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	root := new(actionsRoot)
+	resp, err := s.client.Do(req, root)
+	if err != nil {
+		return nil, resp, err
+	}
+	if l := root.Links; l != nil {
+		resp.Links = l
+	}
+
+	return root.Actions, resp, err
+}
+
 func storageAllocationActionPath(volumeID string) string {
 	return fmt.Sprintf("%s/%s/actions", storageAllocPath, volumeID)
 }

storage_actions_test.go

@@ -72,6 +72,48 @@ func TestStoragesActions_Detach(t *testing.T) {
 	}
 }
 
+func TestStorageActions_Get(t *testing.T) {
+	setup()
+	defer teardown()
+	volumeID := "98d414c6-295e-4e3a-ac58-eb9456c1e1d1"
+
+	mux.HandleFunc("/v2/volumes/"+volumeID+"/actions/456", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		fmt.Fprintf(w, `{"action":{"status":"in-progress"}}`)
+	})
+
+	action, _, err := client.StorageActions.Get(volumeID, 456)
+	if err != nil {
+		t.Errorf("StorageActions.Get returned error: %v", err)
+	}
+
+	expected := &Action{Status: "in-progress"}
+	if !reflect.DeepEqual(action, expected) {
+		t.Errorf("StorageActions.Get returned %+v, expected %+v", action, expected)
+	}
+}
+
+func TestStorageActions_List(t *testing.T) {
+	setup()
+	defer teardown()
+	volumeID := "98d414c6-295e-4e3a-ac58-eb9456c1e1d1"
+
+	mux.HandleFunc("/v2/volumes/"+volumeID+"/actions", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		fmt.Fprintf(w, `{"actions":[{"status":"in-progress"}]}`)
+	})
+
+	actions, _, err := client.StorageActions.List(volumeID, nil)
+	if err != nil {
+		t.Errorf("StorageActions.List returned error: %v", err)
+	}
+
+	expected := []Action{Action{Status: "in-progress"}}
+	if !reflect.DeepEqual(actions, expected) {
+		t.Errorf("StorageActions.List returned %+v, expected %+v", actions, expected)
+	}
+}
+
 func TestStoragesActions_Resize(t *testing.T) {
 	setup()
 	defer teardown()