v1.3.0

pkg/cloudapi/flipgroup/compute_add.go

@@ -2,38 +2,30 @@ package flipgroup
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // Request struct for add compute instance
 type ComputeAddRequest struct {
 	// ID of the Floating IP group to add compute instance to
 	// Required: true
-	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId"`
+	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId" validate:"required"`
 
 	// ID of the compute instance to add to this group
 	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId"`
-}
-
-func (frq ComputeAddRequest) validate() error {
-	if frq.FLIPGroupID == 0 {
-		return errors.New("field FLIPGroupID can not be empty or equal to 0")
-	}
-	if frq.ComputeID == 0 {
-		return errors.New("field ComputeID can not be empty or equal to 0")
-	}
-
-	return nil
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
 // ComputeAdd add compute instance to the Floating IP group
 func (f FLIPGroup) ComputeAdd(ctx context.Context, req ComputeAddRequest) (bool, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, err
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/flipgroup/computeAdd"

pkg/cloudapi/flipgroup/compute_remove.go

@@ -2,38 +2,30 @@ package flipgroup
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // Request struct for remove compute instance
 type ComputeRemoveRequest struct {
 	// ID of the Floating IP group to remove compute instance from
 	// Required: true
-	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId"`
+	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId" validate:"required"`
 
 	// ID of the compute instance to remove
 	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId"`
-}
-
-func (frq ComputeRemoveRequest) validate() error {
-	if frq.FLIPGroupID == 0 {
-		return errors.New("field FLIPGroupID can not be empty or equal to 0")
-	}
-	if frq.ComputeID == 0 {
-		return errors.New("field ComputeID can not be empty or equal to 0")
-	}
-
-	return nil
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
 // ComputeRemove remove compute instance from the Floating IP group
 func (f FLIPGroup) ComputeRemove(ctx context.Context, req ComputeRemoveRequest) (bool, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, err
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/flipgroup/computeRemove"

pkg/cloudapi/flipgroup/create.go

@@ -3,7 +3,6 @@ package flipgroup
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"net/http"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -13,28 +12,28 @@ import (
 type CreateRequest struct {
 	// Account ID
 	// Required: true
-	AccountID uint64 `url:"accountId" json:"accountId"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// FLIPGroup name
 	// Required: true
-	Name string `url:"name" json:"name"`
+	Name string `url:"name" json:"name" validate:"required"`
 
 	// Network type
 	// Should be one of:
 	//	- EXTNET
 	//	- VINS
 	// Required: true
-	NetType string `url:"netType" json:"netType"`
+	NetType string `url:"netType" json:"netType" validate:"computeNetType"`
 
 	// ID of external network or VINS
 	// Required: true
-	NetID uint64 `url:"netId" json:"netId"`
+	NetID uint64 `url:"netId" json:"netId" validate:"required"`
 
 	// Type of client
 	//	- 'compute'
 	//	- 'vins' (will be later)
 	// Required: true
-	ClientType string `url:"clientType" json:"clientType"`
+	ClientType string `url:"clientType" json:"clientType" validate:"flipgroupClientType"`
 
 	// IP address to associate with this group. If empty, the platform will autoselect IP address
 	// Required: false
@@ -45,33 +44,13 @@ type CreateRequest struct {
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }
 
-func (frq CreateRequest) validate() error {
-	if frq.AccountID == 0 {
-		return errors.New("field AccountID can not be empty or equal to 0")
-	}
-	if frq.NetID == 0 {
-		return errors.New("field NetID can not be empty or equal to 0")
-	}
-	if frq.Name == "" {
-		return errors.New("field Name can not be empty")
-	}
-	validator := validators.StringInSlice(frq.NetType, []string{"EXTNET", "VINS"})
-	if !validator {
-		return errors.New("field Name can be only EXTNET or VINS")
-	}
-	validator = validators.StringInSlice(frq.ClientType, []string{"compute", "node"})
-	if !validator {
-		return errors.New("field Name can be only compute or node")
-	}
-
-	return nil
-}
-
 // Create method will create a new FLIPGorup in the specified Account
 func (f FLIPGroup) Create(ctx context.Context, req CreateRequest) (*RecordFLIPGroup, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, err
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/flipgroup/create"

pkg/cloudapi/flipgroup/delete.go

@@ -2,31 +2,26 @@ package flipgroup
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // Request struct for delete FLIPGroup
 type DeleteRequest struct {
 	// FLIPGroup ID
 	// Required: true
-	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId"`
-}
-
-func (frq DeleteRequest) validate() error {
-	if frq.FLIPGroupID == 0 {
-		return errors.New("field FLIPGroupID can not be empty or equal to 0")
-	}
-
-	return nil
+	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId" validate:"required"`
 }
 
 // Delete method wil delete Floating IP group
 func (f FLIPGroup) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, err
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/flipgroup/delete"

pkg/cloudapi/flipgroup/edit.go

@@ -2,39 +2,34 @@ package flipgroup
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // Request struct for edit FLIPGroup
 type EditRequest struct {
 	// FLIPGroup ID
 	// Required: true
-	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId"`
+	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId" validate:"required"`
 
 	// FLIPGroup name
-	// Required: true
+	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
 
 	// FLIPGroup description
-	// Required: true
+	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }
 
-func (frq EditRequest) validate() error {
-	if frq.FLIPGroupID == 0 {
-		return errors.New("field FLIPGroupID can not be empty or equal to 0")
-	}
-
-	return nil
-}
-
 // Edit edits FLIPGroup fields
 func (f FLIPGroup) Edit(ctx context.Context, req EditRequest) (bool, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, err
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/flipgroup/edit"

pkg/cloudapi/flipgroup/get.go

@@ -3,30 +3,25 @@ package flipgroup
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // Request struct for get information about FLIPGroup
 type GetRequest struct {
 	// FLIPGroup ID
 	// Required: true
-	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId"`
-}
-
-func (frq GetRequest) validate() error {
-	if frq.FLIPGroupID == 0 {
-		return errors.New("field FLIPGroupID can not be empty or equal to 0")
-	}
-
-	return nil
+	FLIPGroupID uint64 `url:"flipgroupId" json:"flipgroupId" validate:"required"`
 }
 
 // Get gets details of the specified Floating IP group
 func (f FLIPGroup) Get(ctx context.Context, req GetRequest) (*ItemFLIPGroup, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, err
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/flipgroup/get"