v1.3.0

pkg/cloudbroker/account/delete_user.go

@@ -2,42 +2,34 @@ package account
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // Request struct for revoke access to account
 type DeleteUserRequest struct {
 	// ID of the account
 	// Required: true
-	AccountID uint64 `url:"accountId" json:"accountId"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// ID or emailaddress of the user to remove
 	// Required: true
-	UserName string `url:"username" json:"username"`
+	UserName string `url:"username" json:"username" validate:"required"`
 
 	// Recursively revoke access rights from owned cloudspaces and vmachines
 	// Required: false
 	RecursiveDelete bool `url:"recursivedelete,omitempty" json:"recursivedelete,omitempty"`
 }
 
-func (arq DeleteUserRequest) validate() error {
-	if arq.AccountID == 0 {
-		return errors.New("validation-error: field AccountID must be set")
-	}
-	if arq.UserName == "" {
-		return errors.New("validation-error: field UserName must be set")
-	}
-
-	return nil
-}
-
 // DeleteUser revokes user access from the account
 func (a Account) DeleteUser(ctx context.Context, req DeleteUserRequest) (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 := "/cloudbroker/account/deleteUser"