Merge pull request #44 from thomasheller/delete-server-and-storages

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

Author: alienhaxor

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{}

upcloud/service/service_test.go

@@ -138,6 +138,16 @@ func TestCreateModifyDeleteServer(t *testing.T) {
 	serverDetails := createServer("TestCreateModifyDeleteServer")
 	t.Logf("Server %s with UUID %s created", serverDetails.Title, serverDetails.UUID)
 
+	// Get details about the storage (UUID is required for testing)
+	if len(serverDetails.StorageDevices) == 0 {
+		t.Errorf("Server %s with UUID %s has no storages attached", serverDetails.Title, serverDetails.UUID)
+	}
+
+	firstStorage := serverDetails.StorageDevices[0]
+	storageUUID := firstStorage.UUID
+
+	t.Logf("First storage of server with UUID %s has UUID %s", serverDetails.UUID, storageUUID)
+
 	// Modify the server
 	t.Log("Modifying the server ...")
 
@@ -167,6 +177,76 @@ func TestCreateModifyDeleteServer(t *testing.T) {
 	t.Logf("Deleting the server with UUID %s...", serverDetails.UUID)
 	deleteServer(serverDetails.UUID)
 	t.Log("Server is now deleted")
+
+	// Check if the storage still exists
+	storages, err := svc.GetStorages(&request.GetStoragesRequest{
+		Access: upcloud.StorageAccessPrivate,
+	})
+	handleError(err)
+
+	found := false
+
+	for _, storage := range storages.Storages {
+		if storage.UUID == storageUUID {
+			found = true
+			break
+		}
+	}
+
+	if !found {
+		t.Errorf("Storage with UUID %s not found. It should still exist after deleting server with UUID %s", storageUUID, serverDetails.UUID)
+	}
+
+	t.Log("Storage still exists")
+}
+
+// TestCreateDeleteServerAndStorage performs the following actions:
+//
+// - creates a server
+// - deletes the server including storage
+func TestCreateDeleteServerAndStorage(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode")
+	}
+	t.Parallel()
+
+	// Create a server
+	serverDetails := createServer("TestCreateDeleteServerAndStorage")
+	t.Logf("Server %s with UUID %s created", serverDetails.Title, serverDetails.UUID)
+
+	// Get details about the storage (UUID is required for testing)
+	if len(serverDetails.StorageDevices) == 0 {
+		t.Errorf("Server %s with UUID %s has no storages attached", serverDetails.Title, serverDetails.UUID)
+	}
+
+	firstStorage := serverDetails.StorageDevices[0]
+	storageUUID := firstStorage.UUID
+
+	t.Logf("First storage of server with UUID %s has UUID %s", serverDetails.UUID, storageUUID)
+
+	// Stop the server
+	t.Logf("Stopping server with UUID %s ...", serverDetails.UUID)
+	stopServer(serverDetails.UUID)
+	t.Log("Server is now stopped")
+
+	// Delete the server and storage
+	t.Logf("Deleting the server with UUID %s, including storages...", serverDetails.UUID)
+	deleteServerAndStorages(serverDetails.UUID)
+	t.Log("Server is now deleted")
+
+	// Check if the storage was deleted
+	storages, err := svc.GetStorages(&request.GetStoragesRequest{
+		Access: upcloud.StorageAccessPrivate,
+	})
+	handleError(err)
+
+	for _, storage := range storages.Storages {
+		if storage.UUID == storageUUID {
+			t.Errorf("Storage with UUID %s still exists. It should have been deleted with server with UUID %s", storageUUID, serverDetails.UUID)
+		}
+	}
+
+	t.Log("Storage was deleted, too")
 }
 
 // TestCreateModifyDeleteStorage performs the following actions:
@@ -713,6 +793,15 @@ func deleteServer(uuid string) {
 	handleError(err)
 }
 
+// Deletes the specified server and storages
+func deleteServerAndStorages(uuid string) {
+	err := svc.DeleteServerAndStorages(&request.DeleteServerAndStoragesRequest{
+		UUID: uuid,
+	})
+
+	handleError(err)
+}
+
 // Creates a piece of storage and returns the details about it, panic if creation fails
 func createStorage() *upcloud.StorageDetails {
 	createStorageRequest := request.CreateStorageRequest{