Merge pull request #68 from UpCloudLtd/request-response-type-fixes

fix: server and storage import related type encoding/decoding

Author: Trdls

upcloud/request/server.go

@@ -189,7 +189,7 @@ func (s SSHKeySlice) MarshalJSON() ([]byte, error) {
 type LoginUser struct {
 	CreatePassword string      `json:"create_password,omitempty"`
 	Username       string      `json:"username,omitempty"`
-	SSHKeys        SSHKeySlice `json:"ssh_keys"`
+	SSHKeys        SSHKeySlice `json:"ssh_keys,omitempty"`
 }
 
 // CreateServerIPAddress represents an IP address for a CreateServerRequest

upcloud/storage.go

@@ -181,7 +181,7 @@ type ServerStorageDevice struct {
 type StorageImportDetails struct {
 	ClientContentLength int       `json:"client_content_length"`
 	ClientContentType   string    `json:"client_content_type"`
-	Completed           string    `json:"completed"`
+	Completed           time.Time `json:"completed"`
 	Created             time.Time `json:"created"`
 	DirectUploadURL     string    `json:"direct_upload_url"`
 	ErrorCode           string    `json:"error_code"`
@@ -190,6 +190,7 @@ type StorageImportDetails struct {
 	ReadBytes           int       `json:"read_bytes"`
 	SHA256Sum           string    `json:"sha256sum"`
 	Source              string    `json:"source"`
+	SourceLocation      string    `json:"source_location"`
 	State               string    `json:"state"`
 	UUID                string    `json:"uuid"`
 	WrittenBytes        int       `json:"written_bytes"`
@@ -199,16 +200,25 @@ type StorageImportDetails struct {
 // deeply embedded values.
 func (s *StorageImportDetails) UnmarshalJSON(b []byte) error {
 	type localStorageImport StorageImportDetails
-
 	v := struct {
-		StorageImport localStorageImport `json:"storage_import"`
+		StorageImport struct {
+			localStorageImport
+			Completed string `json:"completed"`
+		} `json:"storage_import"`
 	}{}
 	err := json.Unmarshal(b, &v)
 	if err != nil {
 		return err
 	}
 
-	(*s) = StorageImportDetails(v.StorageImport)
+	if v.StorageImport.Completed != "" {
+		tv, err := time.Parse(time.RFC3339, v.StorageImport.Completed)
+		if err != nil {
+			return err
+		}
+		v.StorageImport.localStorageImport.Completed = tv
+	}
+	*s = StorageImportDetails(v.StorageImport.localStorageImport)
 
 	return nil
 }

upcloud/storage_test.go

@@ -3,6 +3,7 @@ package upcloud
 import (
 	"encoding/json"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -176,7 +177,7 @@ func TestUnmarshalStorageImport(t *testing.T) {
 		"storage_import": {
 		  "client_content_length": 1,
 		  "client_content_type": "abc",
-		  "completed": "def",
+		  "completed": "",
 		  "created": "2020-06-26T08:51:07Z",
 		  "direct_upload_url": "https://fi-hel1.img.upcloud.com/uploader/session/07a6c9a3-300e-4d0e-b935-624f3dbdff3f",
 		  "error_code": "ghi",
@@ -199,7 +200,7 @@ func TestUnmarshalStorageImport(t *testing.T) {
 	testStorageImport := StorageImportDetails{
 		ClientContentLength: 1,
 		ClientContentType:   "abc",
-		Completed:           "def",
+		Completed:           time.Time{},
 		Created:             timeParse("2020-06-26T08:51:07Z"),
 		DirectUploadURL:     "https://fi-hel1.img.upcloud.com/uploader/session/07a6c9a3-300e-4d0e-b935-624f3dbdff3f",
 		ErrorCode:           "ghi",