Merge 'dev' into 'main'

pkg/cloudapi/locations/get_url.go

@@ -1,28 +1,19 @@
-package locations
-
-import (
-	"context"
-
-	"github.com/rudecs/decort-sdk/opts"
-	"github.com/rudecs/decort-sdk/typed"
-)
-
-func (l Locations) GetUrl(ctx context.Context, options ...opts.DecortOpts) (string, error) {
-	url := "/locations/getUrl"
-	prefix := "/cloudapi"
-
-	option := opts.New(options)
-
-	if option != nil {
-		if option.IsAdmin {
-			prefix = "/" + option.AdminValue
-		}
-	}
-	url = prefix + url
-	res, err := l.client.DecortApiCall(ctx, typed.POST, url, nil)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}
+package locations
+
+import (
+	"context"
+	"net/http"
+)
+
+func (l Locations) GetUrl(ctx context.Context) (string, error) {
+	url := "/locations/getUrl"
+	prefix := "/cloudapi"
+
+	url = prefix + url
+	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, nil)
+	if err != nil {
+		return "", err
+	}
+
+	return string(res), nil
+}

pkg/cloudapi/locations/list.go

@@ -1,41 +1,32 @@
-package locations
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/rudecs/decort-sdk/opts"
-	"github.com/rudecs/decort-sdk/typed"
-)
-
-type ListRequest struct {
-	Page uint64 `url:"page"`
-	Size uint64 `url:"size"`
-}
-
-func (l Locations) List(ctx context.Context, req ListRequest, options ...opts.DecortOpts) (LocationsList, error) {
-	url := "/locations/list"
-	prefix := "/cloudapi"
-
-	option := opts.New(options)
-
-	if option != nil {
-		if option.IsAdmin {
-			prefix = "/" + option.AdminValue
-		}
-	}
-	url = prefix + url
-	locationsListRaw, err := l.client.DecortApiCall(ctx, typed.POST, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	locationsList := LocationsList{}
-	err = json.Unmarshal(locationsListRaw, &locationsList)
-	if err != nil {
-		return nil, err
-	}
-
-	return locationsList, nil
-
-}
+package locations
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+)
+
+type ListRequest struct {
+	Page uint64 `url:"page"`
+	Size uint64 `url:"size"`
+}
+
+func (l Locations) List(ctx context.Context, req ListRequest) (LocationsList, error) {
+	url := "/locations/list"
+	prefix := "/cloudapi"
+
+	url = prefix + url
+	locationsListRaw, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	locationsList := LocationsList{}
+	err = json.Unmarshal(locationsListRaw, &locationsList)
+	if err != nil {
+		return nil, err
+	}
+
+	return locationsList, nil
+
+}

pkg/cloudapi/locations/locations.go

@@ -1,15 +1,15 @@
-package locations
-
-import (
-	"github.com/rudecs/decort-sdk/interfaces"
-)
-
-type Locations struct {
-	client interfaces.Caller
-}
-
-func New(client interfaces.Caller) *Locations {
-	return &Locations{
-		client,
-	}
-}
+package locations
+
+import (
+	"github.com/rudecs/decort-sdk/interfaces"
+)
+
+type Locations struct {
+	client interfaces.Caller
+}
+
+func New(client interfaces.Caller) *Locations {
+	return &Locations{
+		client,
+	}
+}

pkg/cloudapi/locations/models.go

@@ -1,14 +1,14 @@
-package locations
-
-type Location struct {
-	GID          int           `json:"gid"`
-	Id           int           `json:"id"`
-	Guid         int           `json:"guid"`
-	LocationCode string        `json:"locationCode"`
-	Name         string        `json:"name"`
-	Flag         string        `json:"flag"`
-	Meta         []interface{} `json:"_meta"`
-	CKey         string        `json:"_ckey"`
-}
-
-type LocationsList []Location
+package locations
+
+type Location struct {
+	GID          uint64        `json:"gid"`
+	ID           uint64        `json:"id"`
+	GUID         uint64        `json:"guid"`
+	LocationCode string        `json:"locationCode"`
+	Name         string        `json:"name"`
+	Flag         string        `json:"flag"`
+	Meta         []interface{} `json:"_meta"`
+	CKey         string        `json:"_ckey"`
+}
+
+type LocationsList []Location