Merge 'dev' into 'main'

pkg/cloudapi/vins/nat_rule_del.go

@@ -1,58 +1,47 @@
-package vins
-
-import (
-	"context"
-	"errors"
-	"strconv"
-
-	"github.com/rudecs/decort-sdk/opts"
-	"github.com/rudecs/decort-sdk/typed"
-)
-
-type NatRuleDelRequest struct {
-	VinsId uint64 `url:"vinsId"`
-	RuleId uint64 `url:"ruleId"`
-}
-
-func (vrq NatRuleDelRequest) Validate() error {
-	if vrq.VinsId == 0 {
-		return errors.New("validation-error: field VinsId can not be empty or equal to 0")
-	}
-
-	if vrq.RuleId == 0 {
-		return errors.New("validation-error: field RuleId can not be empty or equal to 0")
-	}
-
-	return nil
-}
-
-func (v Vins) NatRuleDel(ctx context.Context, req NatRuleDelRequest, options ...opts.DecortOpts) (bool, error) {
-	err := req.Validate()
-	if err != nil {
-		return false, err
-	}
-
-	url := "/vins/natRuleDel"
-	prefix := "/cloudapi"
-
-	option := opts.New(options)
-
-	if option != nil {
-		if option.IsAdmin {
-			prefix = "/" + option.AdminValue
-		}
-	}
-	url = prefix + url
-	res, err := v.client.DecortApiCall(ctx, typed.POST, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, nil
-	}
-
-	return result, nil
-
-}
+package vins
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"strconv"
+)
+
+type NatRuleDelRequest struct {
+	VINSID uint64 `url:"vinsId"`
+	RuleID uint64 `url:"ruleId"`
+}
+
+func (vrq NatRuleDelRequest) Validate() error {
+	if vrq.VINSID == 0 {
+		return errors.New("validation-error: field VINSID can not be empty or equal to 0")
+	}
+
+	if vrq.RuleID == 0 {
+		return errors.New("validation-error: field RuleID can not be empty or equal to 0")
+	}
+
+	return nil
+}
+
+func (v VINS) NatRuleDel(ctx context.Context, req NatRuleDelRequest) (bool, error) {
+	err := req.Validate()
+	if err != nil {
+		return false, err
+	}
+
+	url := "/cloudapi/vins/natRuleDel"
+
+	res, err := v.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
+
+}