Merge pull request #58 from opencredo/master

New Host, Firewall, Network and Router resources

Author: Trdls

examples/upcloud-cli/main.go

@@ -78,9 +78,9 @@ func createServer(s *service.Service) error {
 		Title:    fmt.Sprintf("example-cli-server-%04d", rand.Int31n(1000)),
 		Zone:     "fi-hel2",
 		Plan:     "1xCPU-1GB",
-		StorageDevices: []upcloud.CreateServerStorageDevice{
+		StorageDevices: []request.CreateServerStorageDevice{
 			{
-				Action:  upcloud.CreateServerStorageDeviceActionClone,
+				Action:  request.CreateServerStorageDeviceActionClone,
 				Storage: "01000000-0000-4000-8000-000050010400",
 				Title:   "Centos8 from a template",
 				Size:    50,
@@ -95,7 +95,7 @@ func createServer(s *service.Service) error {
 							Family: upcloud.IPAddressFamilyIPv4,
 						},
 					},
-					Type: upcloud.IPAddressAccessUtility,
+					Type: upcloud.NetworkTypeUtility,
 				},
 			},
 		},

upcloud/client/client.go

@@ -137,6 +137,19 @@ func (c *Client) PerformJSONDeleteRequest(url string) error {
 	return err
 }
 
+// PerformJSONPutUploadRequest performs a PUT request to the specified URL with an io.Reader
+// and returns the response body and eventual errors
+func (c *Client) PerformJSONPutUploadRequest(url string, requestBody io.Reader) ([]byte, error) {
+
+	request, err := http.NewRequest(http.MethodPut, url, requestBody)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return c.performJSONRequest(request)
+}
+
 // Adds common headers to the specified request
 func (c *Client) addJSONRequestHeaders(request *http.Request) *http.Request {
 	request.SetBasicAuth(c.userName, c.password)

upcloud/firewall.go

@@ -55,7 +55,7 @@ type FirewallRule struct {
 	Direction               string `json:"direction"`
 	Family                  string `json:"family"`
 	ICMPType                string `json:"icmp_type,omitempty"`
-	Position                int    `json:"position,string"`
+	Position                int    `json:"position,string,omitempty"`
 	Protocol                string `json:"protocol,omitempty"`
 	SourceAddressStart      string `json:"source_address_start,omitempty"`
 	SourceAddressEnd        string `json:"source_address_end,omitempty"`

upcloud/hosts.go

@@ -0,0 +1,88 @@
+package upcloud
+
+import (
+	"encoding/json"
+	"time"
+)
+
+// Hosts represents a GetHosts response
+type Hosts struct {
+	Hosts []Host `json:"hosts"`
+}
+
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
+func (n *Hosts) UnmarshalJSON(b []byte) error {
+	type localHost Host
+	type hostWrapper struct {
+		Hosts []localHost `json:"host"`
+	}
+
+	v := struct {
+		Hosts hostWrapper `json:"hosts"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	for _, ln := range v.Hosts.Hosts {
+		n.Hosts = append(n.Hosts, Host(ln))
+	}
+
+	return nil
+}
+
+// StatSlice is a slice of Stat structs
+// This exsits to support a custom unmarshaller
+type StatSlice []Stat
+
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
+func (t *StatSlice) UnmarshalJSON(b []byte) error {
+	v := struct {
+		Networks []Stat `json:"stat"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	(*t) = v.Networks
+
+	return nil
+}
+
+// Host represents an individual Host in a response
+type Host struct {
+	ID             int       `json:"id"`
+	Description    string    `json:"description"`
+	Zone           string    `json:"zone"`
+	WindowsEnabled Boolean   `json:"windows_enabled"`
+	Stats          StatSlice `json:"stats"`
+}
+
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
+func (s *Host) UnmarshalJSON(b []byte) error {
+	type localHost Host
+
+	v := struct {
+		Host localHost `json:"host"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	(*s) = Host(v.Host)
+
+	return nil
+}
+
+// Stat represents Host stats in a response
+type Stat struct {
+	Name      string    `json:"name"`
+	Timestamp time.Time `json:"timestamp"`
+	Value     float64   `json:"value"`
+}

upcloud/hosts_test.go

@@ -0,0 +1,166 @@
+package upcloud
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func timeParse(s string) time.Time {
+	t, _ := time.Parse(time.RFC3339, s)
+	return t
+}
+
+// TestUnmarshalHosts tests that multiple Host and Stat are unmarshalled correcltly.
+func TestUnmarshalHosts(t *testing.T) {
+	originalJSON := `
+	  {
+		"hosts": {
+		  "host": [
+			{
+			  "id": 7653311107,
+			  "description": "My Host #1",
+			  "zone": "private-zone-id",
+			  "windows_enabled": "no",
+			  "stats": {
+				"stat": [
+				  {
+					"name": "cpu_idle",
+					"timestamp": "2019-08-09T12:46:57Z",
+					"value": 95.2
+				  },
+				  {
+					"name": "memory_free",
+					"timestamp": "2019-08-09T12:46:57Z",
+					"value": 102
+				  }
+				]
+			  }
+			},
+			{
+			  "id": 8055964291,
+			  "description": "My Host #2",
+			  "zone": "private-zone-id",
+			  "windows_enabled": "no",
+			  "stats": {
+				"stat": [
+				  {
+					"name": "cpu_idle",
+					"timestamp": "2019-08-09T12:46:57Z",
+					"value": 80.1
+				  },
+				  {
+					"name": "memory_free",
+					"timestamp": "2019-08-09T12:46:57Z",
+					"value": 61
+				  }
+				]
+			  }
+			}
+		  ]
+		}
+	  }
+	`
+
+	var hosts Hosts
+	err := json.Unmarshal([]byte(originalJSON), &hosts)
+	assert.NoError(t, err)
+
+	testsHosts := []Host{
+		{
+			ID:             7653311107,
+			Description:    "My Host #1",
+			Zone:           "private-zone-id",
+			WindowsEnabled: false,
+			Stats: []Stat{
+				{
+					Name:      "cpu_idle",
+					Timestamp: timeParse("2019-08-09T12:46:57Z"),
+					Value:     95.2,
+				},
+				{
+					Name:      "memory_free",
+					Timestamp: timeParse("2019-08-09T12:46:57Z"),
+					Value:     102,
+				},
+			},
+		},
+		{
+			ID:             8055964291,
+			Description:    "My Host #2",
+			Zone:           "private-zone-id",
+			WindowsEnabled: false,
+			Stats: []Stat{
+				{
+					Name:      "cpu_idle",
+					Timestamp: timeParse("2019-08-09T12:46:57Z"),
+					Value:     80.1,
+				},
+				{
+					Name:      "memory_free",
+					Timestamp: timeParse("2019-08-09T12:46:57Z"),
+					Value:     61,
+				},
+			},
+		},
+	}
+
+	for i, h := range testsHosts {
+		assert.Equal(t, h, hosts.Hosts[i])
+	}
+}
+
+// TestUnmarshalHosts tests that a single Host and Stat are unmarshalled correcltly.
+func TestUnmarshalHost(t *testing.T) {
+	originalJSON := `
+	{
+		"host": {
+		  "id": 7653311107,
+		  "description": "My Host #1",
+		  "zone": "private-zone-id",
+		  "windows_enabled": "no",
+		  "stats": {
+			"stat": [
+			  {
+				"name": "cpu_idle",
+				"timestamp": "2019-08-09T12:46:57Z",
+				"value": 95.2
+			  },
+			  {
+				"name": "memory_free",
+				"timestamp": "2019-08-09T12:46:57Z",
+				"value": 102
+			  }
+			]
+		  }
+		}
+	  }
+	`
+
+	var host Host
+	err := json.Unmarshal([]byte(originalJSON), &host)
+	assert.NoError(t, err)
+
+	testHost := Host{
+		ID:             7653311107,
+		Description:    "My Host #1",
+		Zone:           "private-zone-id",
+		WindowsEnabled: false,
+		Stats: []Stat{
+			{
+				Name:      "cpu_idle",
+				Timestamp: timeParse("2019-08-09T12:46:57Z"),
+				Value:     95.2,
+			},
+			{
+				Name:      "memory_free",
+				Timestamp: timeParse("2019-08-09T12:46:57Z"),
+				Value:     102,
+			},
+		},
+	}
+
+	assert.Equal(t, testHost, host)
+}