Add Storage Import resources

Author: yoink00

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/request/storage.go

@@ -8,6 +8,12 @@ import (
 	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
 )
 
+// Constants
+const (
+	StorageImportSourceDirectUpload = "direct_upload"
+	StorageImportSourceHTTPImport   = "http_import"
+)
+
 // GetStoragesRequest represents a request for retrieving all or some storages
 type GetStoragesRequest struct {
 	// If specified, only storages with this access type will be retrieved
@@ -282,3 +288,46 @@ type RestoreBackupRequest struct {
 func (r *RestoreBackupRequest) RequestURL() string {
 	return fmt.Sprintf("/storage/%s/restore", r.UUID)
 }
+
+// CreateStorageImportRequest represent a request to import storage.
+type CreateStorageImportRequest struct {
+	StorageUUID string `json:"-"`
+
+	Source         string `json:"source"`
+	SourceLocation string `json:"source_location,omitempty"`
+}
+
+// MarshalJSON is a custom marshaller that deals with
+// deeply embedded values.
+func (r CreateStorageImportRequest) MarshalJSON() ([]byte, error) {
+	type localStorageImportRequest CreateStorageImportRequest
+	v := struct {
+		StorageImportRequest localStorageImportRequest `json:"storage_import"`
+	}{}
+	v.StorageImportRequest = localStorageImportRequest(r)
+
+	return json.Marshal(&v)
+}
+
+// RequestURL implements the Request interface
+func (r *CreateStorageImportRequest) RequestURL() string {
+	return fmt.Sprintf("/storage/%s/import", r.StorageUUID)
+}
+
+// GetStorageImportDetailsRequest represents a request to get details
+// about an import
+type GetStorageImportDetailsRequest struct {
+	UUID string
+}
+
+// RequestURL implements the Request interface
+func (r *GetStorageImportDetailsRequest) RequestURL() string {
+	return fmt.Sprintf("/storage/%s/import", r.UUID)
+}
+
+// WaitForStorageImportCompletionRequest represents a request to wait
+// for storage import to complete.
+type WaitForStorageImportCompletionRequest struct {
+	StorageUUID string
+	Timeout     time.Duration
+}

upcloud/request/storage_test.go

@@ -246,3 +246,37 @@ func TestRestoreBackupRequest(t *testing.T) {
 
 	assert.Equal(t, "/storage/foo/restore", request.RequestURL())
 }
+
+// TestStorageImportRequest tests that StorageImportRequest marshals correctly
+func TestStorageImportRequest(t *testing.T) {
+	request := CreateStorageImportRequest{
+		StorageUUID:    "foo",
+		Source:         StorageImportSourceHTTPImport,
+		SourceLocation: "http://somewhere.com",
+	}
+
+	expectedJSON := `
+	  {
+		  "storage_import": {
+			  "source": "http_import",
+			  "source_location": "http://somewhere.com"
+		  }
+	  }
+	`
+
+	actualJSON, err := json.Marshal(&request)
+	assert.NoError(t, err)
+
+	assert.JSONEq(t, expectedJSON, string(actualJSON))
+
+	assert.Equal(t, "/storage/foo/import", request.RequestURL())
+}
+
+// TestGetStorageImportDetails tests that GetStorageImportDetails objects behave correctly
+func TestGetStorageImportDetails(t *testing.T) {
+	request := GetStorageImportDetailsRequest{
+		UUID: "foo",
+	}
+
+	assert.Equal(t, "/storage/foo/import", request.RequestURL())
+}