Merge 'dev' into 'main'

pkg/cloudapi/image/link.go

@@ -1,57 +1,46 @@
-package image
-
-import (
-	"context"
-	"errors"
-	"strconv"
-
-	"github.com/rudecs/decort-sdk/opts"
-	"github.com/rudecs/decort-sdk/typed"
-)
-
-type LinkRequest struct {
-	ImageId  uint64 `url:"imageId"`
-	TargetId uint64 `url:"targetId"`
-}
-
-func (irq LinkRequest) Validate() error {
-	if irq.ImageId == 0 {
-		return errors.New("validation-error: field ImageId can not be empty or equal to 0")
-	}
-	if irq.TargetId == 0 {
-		return errors.New("validation-error: field TargetId can not be empty or equal to 0")
-	}
-
-	return nil
-}
-
-func (i Image) Link(ctx context.Context, req LinkRequest, options ...opts.DecortOpts) (bool, error) {
-	err := req.Validate()
-	if err != nil {
-		return false, err
-	}
-
-	url := "/image/link"
-	prefix := "/cloudapi"
-
-	option := opts.New(options)
-
-	if option != nil {
-		if option.IsAdmin {
-			prefix = "/" + option.AdminValue
-		}
-	}
-	url = prefix + url
-	res, err := i.client.DecortApiCall(ctx, typed.POST, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-
-}
+package image
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"strconv"
+)
+
+type LinkRequest struct {
+	ImageID  uint64 `url:"imageId"`
+	TargetID uint64 `url:"targetId"`
+}
+
+func (irq LinkRequest) Validate() error {
+	if irq.ImageID == 0 {
+		return errors.New("validation-error: field ImageID can not be empty or equal to 0")
+	}
+	if irq.TargetID == 0 {
+		return errors.New("validation-error: field TargetID can not be empty or equal to 0")
+	}
+
+	return nil
+}
+
+func (i Image) Link(ctx context.Context, req LinkRequest) (bool, error) {
+	err := req.Validate()
+	if err != nil {
+		return false, err
+	}
+
+	url := "/cloudapi/image/link"
+
+	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+
+}