Support deletion of servers including all attached storages, fixes #43

Author: thomasheller

upcloud/request/server.go

@@ -3,9 +3,10 @@ package request
 import (
 	"encoding/xml"
 	"fmt"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
 	"strings"
 	"time"
+
+	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
 )
 
 // Constants
@@ -192,6 +193,16 @@ func (r *DeleteServerRequest) RequestURL() string {
 	return fmt.Sprintf("/server/%s", r.UUID)
 }
 
+// DeleteServerAndStoragesRequest represents a request to delete a server and all attached storages
+type DeleteServerAndStoragesRequest struct {
+	UUID string
+}
+
+// RequestURL implements the Request interface
+func (r *DeleteServerAndStoragesRequest) RequestURL() string {
+	return fmt.Sprintf("/server/%s/?storages=1", r.UUID)
+}
+
 // TagServerRequest represents a request to tag a server with one or more tags
 type TagServerRequest struct {
 	UUID string

upcloud/request/server_test.go

@@ -2,10 +2,11 @@ package request
 
 import (
 	"encoding/xml"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
+	"github.com/stretchr/testify/assert"
 )
 
 // TestGetServerDetailsRequest tests that GetServerDetailsRequest objects behave correctly
@@ -127,6 +128,15 @@ func TestDeleteServerRequest(t *testing.T) {
 	assert.Equal(t, "/server/foo", request.RequestURL())
 }
 
+// TestDeleteServerAndStoragesRequest tests that DeleteServerAndStoragesRequest objects behave correctly
+func TestDeleteServerAndStoragesRequest(t *testing.T) {
+	request := DeleteServerAndStoragesRequest{
+		UUID: "foo",
+	}
+
+	assert.Equal(t, "/server/foo/?storages=1", request.RequestURL())
+}
+
 // TestTagServerRequest tests that TestTagServer behaves correctly
 func TestTagServerRequest(t *testing.T) {
 	// Test with multiple tags

upcloud/service/service.go

@@ -270,6 +270,17 @@ func (s *Service) DeleteServer(r *request.DeleteServerRequest) error {
 	return nil
 }
 
+// DeleteServerAndStorages deletes the specified server and all attached storages
+func (s *Service) DeleteServerAndStorages(r *request.DeleteServerAndStoragesRequest) error {
+	err := s.client.PerformDeleteRequest(s.client.CreateRequestUrl(r.RequestURL()))
+
+	if err != nil {
+		return parseServiceError(err)
+	}
+
+	return nil
+}
+
 // TagServer tags a server with with one or more tags
 func (s *Service) TagServer(r *request.TagServerRequest) (*upcloud.ServerDetails, error) {
 	serverDetails := upcloud.ServerDetails{}