feat(storage): labels support (#214)

Author: peknur

CHANGELOG.md

@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Added
+- labels support for storages
+
 ### Changed
 - errors: all service method now return `Problem` type in case of errors (*BREAKING CHANGE*)
 

upcloud/request/storage.go

@@ -28,23 +28,29 @@ type GetStoragesRequest struct {
 	Type string
 	// If specified, only storages marked as favorite will be retrieved
 	Favorite bool
+
+	Filters []QueryFilter
 }
 
 // RequestURL implements the Request interface
 func (r *GetStoragesRequest) RequestURL() string {
+	url := "/storage"
 	if r.Access != "" {
-		return fmt.Sprintf("/storage/%s", r.Access)
+		url = fmt.Sprintf("%s/%s", url, r.Access)
 	}
 
 	if r.Type != "" {
-		return fmt.Sprintf("/storage/%s", r.Type)
+		url = fmt.Sprintf("%s/%s", url, r.Type)
 	}
 
 	if r.Favorite {
-		return "/storage/favorite"
+		url = url + "/favorite"
 	}
 
-	return "/storage"
+	if len(r.Filters) == 0 {
+		return url
+	}
+	return fmt.Sprintf("%s?%s", url, encodeQueryFilters(r.Filters))
 }
 
 // GetStorageDetailsRequest represents a request for retrieving details about a piece of storage
@@ -64,6 +70,7 @@ type CreateStorageRequest struct {
 	Title      string              `json:"title,omitempty"`
 	Zone       string              `json:"zone"`
 	BackupRule *upcloud.BackupRule `json:"backup_rule,omitempty"`
+	Labels     []upcloud.Label     `json:"labels,omitempty"`
 }
 
 // RequestURL implements the Request interface
@@ -90,6 +97,7 @@ type ModifyStorageRequest struct {
 	Title      string              `json:"title,omitempty"`
 	Size       int                 `json:"size,omitempty,string"`
 	BackupRule *upcloud.BackupRule `json:"backup_rule,omitempty"`
+	Labels     *[]upcloud.Label    `json:"labels,omitempty"`
 }
 
 // MarshalJSON is a custom marshaller that deals with

upcloud/request/storage_test.go

@@ -21,6 +21,30 @@ func TestGetStoragesRequest(t *testing.T) {
 	request.Favorite = false
 	request.Type = upcloud.StorageTypeDisk
 	assert.Equal(t, "/storage/disk", request.RequestURL())
+
+	request.Filters = []QueryFilter{
+		FilterLabel{
+			Label: upcloud.Label{
+				Key:   "color",
+				Value: "green",
+			},
+		},
+		FilterLabelKey{Key: "size"},
+	}
+	assert.Equal(t, "/storage/disk"+"?label=color%3Dgreen&label=size", request.RequestURL())
+
+	r := GetStoragesRequest{
+		Filters: []QueryFilter{
+			FilterLabel{
+				Label: upcloud.Label{
+					Key:   "color",
+					Value: "green",
+				},
+			},
+			FilterLabelKey{Key: "size"},
+		},
+	}
+	assert.Equal(t, "/storage?label=color%3Dgreen&label=size", r.RequestURL())
 }
 
 // TestGetStorageDetailsRequest tests that GetStorageDetailsRequest objects behave correctly