Merge pull request #51 from opencredo/convert_3_functions_to_json

Convert initial 3 functions to JSON API

Author: Trdls

examples/upcloud-cli/main.go

@@ -0,0 +1,202 @@
+package main
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"math/rand"
+	"os"
+	"time"
+
+	"git.sr.ht/~yoink00/goflenfig"
+	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/upcloud/client"
+	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/davecgh/go-spew/spew"
+)
+
+var username string
+var password string
+
+func init() {
+	goflenfig.Prefix("UPCLOUD_")
+	goflenfig.StringVar(&username, "username", "", "UpCloud user name")
+	goflenfig.StringVar(&password, "password", "", "UpCloud password")
+
+	rand.Seed(time.Now().Unix())
+}
+
+func main() {
+	os.Exit(run())
+}
+
+func run() int {
+	goflenfig.Parse()
+
+	command := flag.Arg(0)
+
+	if len(username) == 0 {
+		fmt.Fprintln(os.Stderr, "Username must be specified")
+		return 1
+	}
+
+	if len(password) == 0 {
+		fmt.Fprintln(os.Stderr, "Password must be specified")
+		return 2
+	}
+
+	fmt.Println("Creating new client")
+	c := client.New(username, password)
+	s := service.New(c)
+
+	switch command {
+	case "deleteservers":
+		if err := deleteServers(s); err != nil {
+			return 1
+		}
+	case "deletestorage":
+		if err := deleteStorage(s); err != nil {
+			return 2
+		}
+	case "createserver":
+		if err := createServer(s); err != nil {
+			return 3
+		}
+	default:
+		fmt.Fprintln(os.Stderr, "Unknown command: ", command)
+		return 99
+	}
+
+	return 0
+}
+
+func createServer(s *service.Service) error {
+	fmt.Println("Creating server")
+	details, err := s.CreateServer(&request.CreateServerRequest{
+		Hostname: "stuart.example.com",
+		Title:    fmt.Sprintf("example-cli-server-%04d", rand.Int31n(1000)),
+		Zone:     "fi-hel2",
+		Plan:     "1xCPU-1GB",
+		StorageDevices: []upcloud.CreateServerStorageDevice{
+			{
+				Action:  upcloud.CreateServerStorageDeviceActionClone,
+				Storage: "01000000-0000-4000-8000-000050010400",
+				Title:   "Centos8 from a template",
+				Size:    50,
+				Tier:    upcloud.StorageTierMaxIOPS,
+			},
+		},
+		IPAddresses: []request.CreateServerIPAddress{
+			{
+				Access: upcloud.IPAddressAccessPrivate,
+				Family: upcloud.IPAddressFamilyIPv4,
+			},
+		},
+	})
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to create server: %#v\n", err)
+		return err
+	}
+	spew.Println(details)
+	if len(details.UUID) == 0 {
+		fmt.Fprintf(os.Stderr, "UUID missing")
+		return errors.New("UUID too short")
+	}
+	details, err = s.WaitForServerState(&request.WaitForServerStateRequest{
+		UUID:         details.UUID,
+		DesiredState: upcloud.ServerStateStarted,
+		Timeout:      1 * time.Minute,
+	})
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to wait for server: %#v", err)
+		return err
+	}
+
+	fmt.Printf("Created server: %#v\n", details)
+
+	return nil
+}
+
+func deleteServers(s *service.Service) error {
+	fmt.Println("Getting servers")
+	servers, err := s.GetServers()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to get servers: %#v\n", err)
+		return err
+	}
+
+	fmt.Printf("Retrieved %d servers\n", len(servers.Servers))
+
+	if len(servers.Servers) > 0 {
+		fmt.Println("Deleting all servers")
+		for _, server := range servers.Servers {
+			if server.State != upcloud.ServerStateStopped {
+				fmt.Printf("Server %s (%s) is not stopped. Stopping\n", server.Title, server.UUID)
+				_, err := s.StopServer(&request.StopServerRequest{
+					UUID:     server.UUID,
+					StopType: request.ServerStopTypeHard,
+				})
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "Unable to stop server: %#v\n", err)
+					return err
+				}
+				_, err = s.WaitForServerState(&request.WaitForServerStateRequest{
+					UUID:         server.UUID,
+					DesiredState: upcloud.ServerStateStopped,
+					Timeout:      1 * time.Minute,
+				})
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "Failed to wait for server to reach desired state: %#v", err)
+					return err
+				}
+			}
+			fmt.Printf("Deleting %s (%s)\n", server.Title, server.UUID)
+			err := s.DeleteServerAndStorages(&request.DeleteServerAndStoragesRequest{
+				UUID: server.UUID,
+			})
+
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Unable to delete server: %#v\n", err)
+				return err
+			}
+			fmt.Printf("Successfully deleted %s (%s)\n", server.Title, server.UUID)
+		}
+	}
+
+	return nil
+}
+
+func deleteStorage(s *service.Service) error {
+	fmt.Println("Getting storage")
+	storages, err := s.GetStorages(&request.GetStoragesRequest{
+		Access: upcloud.StorageAccessPrivate,
+	})
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to get storages: %#v\n", err)
+		return err
+	}
+
+	fmt.Printf("Retrieved %d storages\n", len(storages.Storages))
+
+	if len(storages.Storages) > 0 {
+		fmt.Println("Deleting all storages")
+		for _, storage := range storages.Storages {
+			err := errors.New("Dummy")
+			for i := 0; err != nil && i < 5; i++ {
+				fmt.Printf("%d: Deleting %s (%s)\n", i, storage.Title, storage.UUID)
+				err = s.DeleteStorage(&request.DeleteStorageRequest{
+					UUID: storage.UUID,
+				})
+			}
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Unable to delete storage: %#v (%s)\n", err, err.Error())
+				return err
+			}
+
+			fmt.Printf("Successfully deleted %s (%s)\n", storage.Title, storage.UUID)
+		}
+	}
+
+	return nil
+}

go.mod

@@ -3,7 +3,9 @@ module github.com/UpCloudLtd/upcloud-go-api
 go 1.14
 
 require (
+	git.sr.ht/~yoink00/goflenfig v0.1.0
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/davecgh/go-spew v1.1.1
 	github.com/hashicorp/go-cleanhttp v0.5.1
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/stretchr/testify v1.6.1

go.sum

@@ -1,7 +1,11 @@
+git.sr.ht/~yoink00/goflenfig v0.1.0 h1:8RqL7olbs64EHus97F+S1wuPKFco9Av2FmY3Sk6bPoQ=
+git.sr.ht/~yoink00/goflenfig v0.1.0/go.mod h1:+b5SR2TmdQHQ2WqgotlpJEN0xjijoDz6V3pzyfyc6v4=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=

upcloud/client/client.go

@@ -63,7 +63,7 @@ func (c *Client) CreateRequestUrl(location string) string {
 
 // PerformGetRequest performs a GET request to the specified URL and returns the response body and eventual errors
 func (c *Client) PerformGetRequest(url string) ([]byte, error) {
-	request, err := http.NewRequest("GET", url, nil)
+	request, err := http.NewRequest(http.MethodGet, url, nil)
 
 	if err != nil {
 		return nil, err
@@ -72,6 +72,17 @@ func (c *Client) PerformGetRequest(url string) ([]byte, error) {
 	return c.performRequest(request)
 }
 
+// PerformJSONGetRequest performs a GET request to the specified URL and returns the response body and eventual errors
+func (c *Client) PerformJSONGetRequest(url string) ([]byte, error) {
+	request, err := http.NewRequest(http.MethodGet, url, nil)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return c.performJSONRequest(request)
+}
+
 // PerformPostRequest performs a POST request to the specified URL and returns the response body and eventual errors
 func (c *Client) PerformPostRequest(url string, requestBody []byte) ([]byte, error) {
 	var bodyReader io.Reader
@@ -80,7 +91,7 @@ func (c *Client) PerformPostRequest(url string, requestBody []byte) ([]byte, err
 		bodyReader = bytes.NewBuffer(requestBody)
 	}
 
-	request, err := http.NewRequest("POST", url, bodyReader)
+	request, err := http.NewRequest(http.MethodPost, url, bodyReader)
 
 	if err != nil {
 		return nil, err
@@ -89,6 +100,23 @@ func (c *Client) PerformPostRequest(url string, requestBody []byte) ([]byte, err
 	return c.performRequest(request)
 }
 
+// PerformPostRequest performs a POST request to the specified URL and returns the response body and eventual errors
+func (c *Client) PerformJSONPostRequest(url string, requestBody []byte) ([]byte, error) {
+	var bodyReader io.Reader
+
+	if requestBody != nil {
+		bodyReader = bytes.NewBuffer(requestBody)
+	}
+
+	request, err := http.NewRequest(http.MethodPost, url, bodyReader)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return c.performJSONRequest(request)
+}
+
 // PerformPutRequest performs a PUT request to the specified URL and returns the response body and eventual errors
 func (c *Client) PerformPutRequest(url string, requestBody []byte) ([]byte, error) {
 	var bodyReader io.Reader
@@ -108,7 +136,7 @@ func (c *Client) PerformPutRequest(url string, requestBody []byte) ([]byte, erro
 
 // PerformDeleteRequest performs a DELETE request to the specified URL and returns the response body and eventual errors
 func (c *Client) PerformDeleteRequest(url string) error {
-	request, err := http.NewRequest("DELETE", url, nil)
+	request, err := http.NewRequest(http.MethodDelete, url, nil)
 
 	if err != nil {
 		return err
@@ -118,6 +146,18 @@ func (c *Client) PerformDeleteRequest(url string) error {
 	return err
 }
 
+// PerformJSONDeleteRequest performs a DELETE request to the specified URL and returns the response body and eventual errors
+func (c *Client) PerformJSONDeleteRequest(url string) error {
+	request, err := http.NewRequest(http.MethodDelete, url, nil)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = c.performJSONRequest(request)
+	return err
+}
+
 // Adds common headers to the specified request
 func (c *Client) addRequestHeaders(request *http.Request) *http.Request {
 	request.SetBasicAuth(c.userName, c.password)
@@ -127,6 +167,15 @@ func (c *Client) addRequestHeaders(request *http.Request) *http.Request {
 	return request
 }
 
+// Adds common headers to the specified request
+func (c *Client) addJSONRequestHeaders(request *http.Request) *http.Request {
+	request.SetBasicAuth(c.userName, c.password)
+	request.Header.Add("Accept", "application/json")
+	request.Header.Add("Content-Type", "application/json")
+
+	return request
+}
+
 // Performs the specified HTTP request and returns the response through handleResponse()
 func (c *Client) performRequest(request *http.Request) ([]byte, error) {
 	c.addRequestHeaders(request)
@@ -139,6 +188,18 @@ func (c *Client) performRequest(request *http.Request) ([]byte, error) {
 	return handleResponse(response)
 }
 
+// Performs the specified HTTP request and returns the response through handleResponse()
+func (c *Client) performJSONRequest(request *http.Request) ([]byte, error) {
+	c.addJSONRequestHeaders(request)
+	response, err := c.httpClient.Do(request)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return handleResponse(response)
+}
+
 // Returns the base URL to use for API requests
 func (c *Client) getBaseUrl() string {
 	urlVersion, _ := semver.Make(c.apiVersion)

upcloud/error.go

@@ -1,11 +1,29 @@
 package upcloud
 
-import "fmt"
+import (
+	"encoding/json"
+	"fmt"
+)
 
 // Error represents an error
 type Error struct {
-	ErrorCode    string `xml:"error_code"`
-	ErrorMessage string `xml:"error_message"`
+	ErrorCode    string `xml:"error_code" json:"error_code"`
+	ErrorMessage string `xml:"error_message" json:"error_message"`
+}
+
+func (e *Error) UnmarshalJSON(b []byte) error {
+	type localError Error
+	v := struct {
+		Error localError `json:"error"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	(*e) = Error(v.Error)
+
+	return nil
 }
 
 // Error implements the Error interface