add delete storage

Author: sp-yduck

api/task_type.go

@@ -3,7 +3,6 @@ package api
 type Task struct {
 	Endtime int `json:"endtime"`
 	// Id        string `json:"id,omitempty"`
-	Node      string `json:"node"`
 	PID       int    `json:"pid"`
 	PStart    int    `json:"pstart"`
 	StartTime int    `json:"starttime"`

rest/client.go

@@ -83,16 +83,21 @@ func withLogin() ClientOption {
 }
 
 func (c *RESTClient) Do(httpMethod, urlPath string, req, v interface{}) error {
-	jsonReq, err := json.Marshal(req)
+	url, err := url.JoinPath(c.endpoint, urlPath)
 	if err != nil {
 		return err
 	}
 
-	url, err := url.JoinPath(c.endpoint, urlPath)
-	if err != nil {
-		return err
+	var body io.Reader
+	if req != nil {
+		jsonReq, err := json.Marshal(req)
+		if err != nil {
+			return err
+		}
+		body = bytes.NewReader(jsonReq)
 	}
-	httpReq, err := http.NewRequest(httpMethod, url, bytes.NewReader(jsonReq))
+
+	httpReq, err := http.NewRequest(httpMethod, url, body)
 	if err != nil {
 		return err
 	}
@@ -168,18 +173,19 @@ func checkResponse(res *http.Response) error {
 	if res.StatusCode >= 200 && res.StatusCode <= 299 {
 		return nil
 	}
-	if res.StatusCode == http.StatusInternalServerError || res.StatusCode == http.StatusNotImplemented {
-		return &Error{code: res.StatusCode, returnMessage: NotFound}
-	}
-	if res.StatusCode == http.StatusUnauthorized || res.StatusCode == http.StatusForbidden {
-		return &Error{code: res.StatusCode, returnMessage: NotAuthorized}
-	}
 
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return errors.Errorf("failed to read body while handling http response of status %d : %v", res.StatusCode, err)
 	}
 
+	if res.StatusCode == http.StatusInternalServerError || res.StatusCode == http.StatusNotImplemented {
+		return &Error{code: res.StatusCode, returnMessage: res.Status}
+	}
+	if res.StatusCode == http.StatusUnauthorized || res.StatusCode == http.StatusForbidden {
+		return &Error{code: res.StatusCode, returnMessage: NotAuthorized}
+	}
+
 	if res.StatusCode == http.StatusBadRequest {
 		var errorskey map[string]json.RawMessage
 		if err := json.Unmarshal(body, &errorskey); err != nil {

rest/storage.go

@@ -1,6 +1,8 @@
 package rest
 
 import (
+	"fmt"
+
 	"github.com/sp-yduck/proxmox-go/api"
 )
 
@@ -34,3 +36,11 @@ func (c *RESTClient) CreateStorage(name, storageType string, options api.Storage
 	}
 	return storage, nil
 }
+
+func (c *RESTClient) DeleteStorage(name string) error {
+	path := fmt.Sprintf("/storage/%s", name)
+	if err := c.Delete(path, nil, nil); err != nil {
+		return err
+	}
+	return nil
+}

rest/storage_test.go

@@ -0,0 +1,71 @@
+package rest
+
+import (
+	"time"
+
+	"github.com/sp-yduck/proxmox-go/api"
+)
+
+func (s *TestSuite) TestGetStorages() {
+	storages, err := s.restclient.GetStorages()
+	if err != nil {
+		s.T().Fatalf("failed to get storages: %v", err)
+	}
+	s.T().Logf("get storages: %v", storages)
+}
+
+func (s *TestSuite) GetTestStorage() *api.Storage {
+	storages, err := s.restclient.GetStorages()
+	if err != nil {
+		s.T().Fatalf("failed to get storages: %v", err)
+	}
+	return storages[0]
+}
+
+func (s *TestSuite) TestGetStorage() {
+	testStorageName := s.GetTestStorage().Storage
+
+	storage, err := s.restclient.GetStorage(testStorageName)
+	if err != nil {
+		s.T().Fatalf("failed to get storage(name=%s): %v", testStorageName, err)
+	}
+	s.T().Logf("get storage: %v", *storage)
+}
+
+func (s *TestSuite) EnsureNoStorage(name string) {
+	storage, err := s.restclient.GetStorage(name)
+	if err == nil {
+		s.T().Logf("error: %v", err)
+		if err := s.restclient.DeleteStorage(storage.Storage); err != nil {
+			s.T().Fatalf("failed to ensure no storage (name=%s): %v", storage.Storage, err)
+		}
+		time.Sleep(2 * time.Second)
+	}
+	if err != nil && !IsNotFound(err) {
+		s.T().Logf("failed to get storage(name=%s): %v", name, err)
+	}
+}
+
+func (s *TestSuite) TestCreateDeleteStorage() {
+	testStorageName := "test-proxmox-go"
+	s.EnsureNoStorage(testStorageName)
+
+	// create
+	testOptions := api.StorageCreateOptions{
+		Content: "images",
+		Mkdir:   true,
+		Path:    "/var/lib/vz/test",
+	}
+	storage, err := s.restclient.CreateStorage(testStorageName, "dir", testOptions)
+	if err != nil {
+		s.T().Fatalf("failed to create storage(name=%s): %v", testStorageName, err)
+	}
+	s.T().Logf("create storage: %v", *storage)
+	time.Sleep(2 * time.Second)
+
+	// delete
+	err = s.restclient.DeleteStorage(testStorageName)
+	if err != nil {
+		s.T().Fatalf("failed to delete storage(name=%s): %v", testStorageName, err)
+	}
+}

rest/task_test.go

@@ -0,0 +1,39 @@
+package rest
+
+import (
+	"github.com/sp-yduck/proxmox-go/api"
+)
+
+func (s *TestSuite) GetTestNode() *api.Node {
+	nodes, err := s.restclient.GetNodes()
+	if err != nil {
+		s.T().Errorf("failed to get nodes: %v", err)
+	}
+	return nodes[0]
+}
+
+func (s *TestSuite) TestGetTasks() {
+	testNodeName := s.GetTestNode().Node
+
+	tasks, err := s.restclient.GetTasks(testNodeName)
+	if err != nil {
+		s.T().Errorf("failed to get tasks on a node=%s: %v", testNodeName, err)
+	}
+	s.T().Logf("get tasks: %v", tasks)
+}
+
+func (s *TestSuite) TestGetTask() {
+	testNodeName := s.GetTestNode().Node
+
+	tasks, err := s.restclient.GetTasks(testNodeName)
+	if err != nil {
+		s.T().Errorf("failed to get tasks on a node=%s: %v", testNodeName, err)
+	}
+
+	testTaskUPID := tasks[0].UPID
+	task, err := s.restclient.GetTask(testNodeName, testTaskUPID)
+	if err != nil {
+		s.T().Errorf("failed to get task(upid=%s) on a node=%s: %v", testTaskUPID, testNodeName, err)
+	}
+	s.T().Logf("get task: %v", *task)
+}