v1.12.6

.gitignore

@@ -1,3 +1,10 @@
 cmd/
 .idea/
-.vscode/
+.vscode/
+.fleet/
+.DS_Store
+tests/platform_upgrade/.env
+tests/platform_upgrade/input.json
+tests/platform_upgrade/*.txt
+tests/platform_upgrade/*.log
+*.env

CHANGELOG.md

@@ -1,4 +1,32 @@
-## Version 1.6.0-beta
+## Version 1.12.6
 
-### Bugfix
-- Fixed RoudTrip bug in HTTP transport, made it concurrent safe
+Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами
+Метод `ListStacks` в cloudbroker/image стал deprecated и в следующих версиях будет удалён
+Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены
+
+### Добавлено
+
+#### общее
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-638 | Добавлена поддержка версий 4.1.0 и 4.2.0 в функцию check |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-481 | Метод `AsyncCreateCDROMImage` в cloudbroker/image |
+
+#### node 
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-634 | Метод `UpdateDescription` и структура запроса `UpdateDescriptionRequest` в cloudbroker/node |
+
+#### stpolicy
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-636 | Вычисляемое поле `StoragePolicyID` в структуры ответа `InfoStoragePolicy` и `ItemStoragePolicy` в `cloudapi/stpolicy` и в cloudbroker/stpolicy |
+
+#### vins 
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-637 | Вычисляемое поле `LiveMigrationJobID` в структуры ответа `RecordVNFDev` в cloudapi/vins и в `VNFDev` cloudbroker/vins |

LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2022 Basis LTD
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README_EN.md

@@ -1,62 +0,0 @@
-# Decort SDK
-
-Decort SDK is a library, written in GO (Golang) for interact with the **DECORT** API.  
-The library contents structures and methods for requesting to an user (cloudapi) and admin (cloudbroker) groups of API.  
-Also the library have structures for responses.
-
-## Contents
-
-- [Install](#install)
-- [API List](#api-list)
-- [Examples](#examples)
-- [Examples2](#examples2)
-
-## Install
-
-```bash
-go get -u repository.basistech.ru/BASIS/decort-golang-sdk
-```
-
-## API List
-
-## Examples
-
-```go
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmx86"
-)
-
-func main() {
-	cfg := config.Config{
-		AppID:     "<APPID>",
-		AppSecret: "<APPSECRET>",
-		SSOURL:    "https://sso.digitalenergy.online",
-		DecortURL: "https://mr4.digitalenergy.online",
-		Retries:   5,
-	}
-	client := decort.New(cfg)
-	req := kvmx86.CreateRequest{
-		RGID:    123,
-		Name:    "compute",
-		CPU:     4,
-		RAM:     4096,
-		ImageID: 321,
-	}
-
-	res, err := client.KVMX86().Create(context.Background(), req)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println(res)
-}
-```
-
-## Examples2

check.go

@@ -0,0 +1,106 @@
+package decortsdk
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+)
+
+type CheckInfo struct {
+	Version string `json:"version"`
+	Build   uint64 `json:"build"`
+}
+
+const versionURL = "/system/info/version"
+
+func (de DecortClient) Check() (*CheckInfo, error) {
+	res, err := de.DecortApiCall(context.Background(), http.MethodGet, versionURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	info := CheckInfo{}
+
+	err = json.Unmarshal([]byte(strings.Replace(strings.Trim(string(res), `"`), "\\", "", -1)), &info)
+	if err != nil {
+		var v string
+		json.Unmarshal([]byte(res), &v)
+		if _, exists := constants.VersionMap[v]; exists {
+			info.Version = v
+		} else {
+			return nil, fmt.Errorf("platform version isn't supported")
+		}
+	}
+
+	if v, ok := constants.VersionMap[info.Version]; ok {
+		if v == "-" {
+			return &info, nil
+		}
+		return nil, errors.New(fmt.Sprintf("SDK don't support platform version %s, please use %s SDK version", info.Version, v))
+	}
+
+	return nil, errors.New(fmt.Sprintf("platform version %s isn't supported", info.Version))
+}
+
+func (bvs BVSDecortClient) Check() (*CheckInfo, error) {
+	res, err := bvs.DecortApiCall(context.Background(), http.MethodGet, versionURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	info := CheckInfo{}
+
+	err = json.Unmarshal([]byte(strings.Replace(strings.Trim(string(res), `"`), "\\", "", -1)), &info)
+	if err != nil {
+		var v string
+		json.Unmarshal([]byte(res), &v)
+		if _, exists := constants.VersionMap[v]; exists {
+			info.Version = v
+		} else {
+			return nil, fmt.Errorf("platform version isn't supported")
+		}
+	}
+
+	if v, ok := constants.VersionMap[info.Version]; ok {
+		if v == "-" {
+			return &info, nil
+		}
+		return nil, errors.New(fmt.Sprintf("SDK don't support platform version %s, please use %s SDK version", info.Version, v))
+	}
+
+	return nil, errors.New(fmt.Sprintf("platform version %s isn't supported", info.Version))
+}
+
+func (ldc LegacyDecortClient) Check() (*CheckInfo, error) {
+	res, err := ldc.DecortApiCall(context.Background(), http.MethodGet, versionURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	info := CheckInfo{}
+
+	err = json.Unmarshal([]byte(strings.Replace(strings.Trim(string(res), `"`), "\\", "", -1)), &info)
+	if err != nil {
+		var v string
+		json.Unmarshal([]byte(res), &v)
+		if _, exists := constants.VersionMap[v]; exists {
+			info.Version = v
+		} else {
+			return nil, fmt.Errorf("platform version isn't supported")
+		}
+	}
+
+	if v, ok := constants.VersionMap[info.Version]; ok {
+		if v == "-" {
+			return &info, nil
+		}
+		return nil, errors.New(fmt.Sprintf("SDK don't support platform version %s, please use %s SDK version", info.Version, v))
+	}
+
+	return nil, errors.New(fmt.Sprintf("platform version %s isn't supported", info.Version))
+}

client.go

@@ -1,24 +1,37 @@
 package decortsdk
 
 import (
+	"bytes"
 	"context"
-	"errors"
+	"crypto/tls"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
 	"io"
+	"mime/multipart"
 	"net/http"
+	"reflect"
+	"strconv"
 	"strings"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
+	"sync"
+	"time"
 
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/client"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
 )
 
-// HTTP-client for platform
+// DecortClient is HTTP-client for platform
 type DecortClient struct {
-	decortURL string
-	client    *http.Client
+	decortURL  string
+	client     *http.Client
+	cfg        config.Config
+	expiryTime time.Time
+	mutex      *sync.Mutex
 }
 
 // Сlient builder
@@ -29,7 +42,16 @@ func New(cfg config.Config) *DecortClient {
 
 	return &DecortClient{
 		decortURL: cfg.DecortURL,
-		client:    client.NewHttpClient(cfg),
+		client: &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					//nolint:gosec
+					InsecureSkipVerify: cfg.SSLSkipVerify,
+				},
+			},
+		},
+		cfg:   trimConfig(&cfg),
+		mutex: &sync.Mutex{},
 	}
 }
 
@@ -43,33 +65,385 @@ func (dc *DecortClient) CloudBroker() *cloudbroker.CloudBroker {
 	return cloudbroker.New(dc)
 }
 
+// SDN builder
+func (dc *DecortClient) SDN() *sdn.SDN {
+	return sdn.New(dc)
+}
+
 // DecortApiCall method for sending requests to the platform
 func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-	values, err := query.Values(params)
+
+	var body *bytes.Buffer
+	var ctype string
+
+	byteSlice, ok := params.([]byte)
+	if ok {
+		body = bytes.NewBuffer(byteSlice)
+		// ctype = "application/x-iso9660-image"
+		ctype = "application/octet-stream"
+	} else {
+		values, err := query.Values(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBufferString(values.Encode())
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
 	if err != nil {
 		return nil, err
 	}
 
-	body := strings.NewReader(values.Encode())
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, body)
+	// get token
+	if err = dc.getToken(ctx); err != nil {
+		return nil, err
+	}
+	// perform request
+	respBytes, err := dc.do(req, ctype)
 	if err != nil {
 		return nil, err
 	}
 
+	return respBytes, err
+}
+
+// DecortApiCallCtype method for sending requests to the platform with content type
+func (dc *DecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
+
+	var body *bytes.Buffer
+
+	switch ctype {
+	case constants.MIMESTREAM:
+		body = bytes.NewBuffer(params.([]byte))
+	case constants.MIMEJSON:
+		jsonBody, err := json.Marshal(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBuffer(jsonBody)
+	default:
+		ctype = constants.MIMEPOSTForm
+		values, err := query.Values(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBufferString(values.Encode())
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if err = dc.getToken(ctx); err != nil {
+		return nil, err
+	}
+	// perform request
+	respBytes, err := dc.do(req, ctype)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBytes, err
+}
+
+// DecortApiCallMP method for sending requests to the platform
+func (dc *DecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+	body, ctype, err := multiPartReq(params)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if err = dc.getToken(ctx); err != nil {
+		return nil, err
+	}
+
+	// perform request
+	respBytes, err := dc.do(req, ctype)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBytes, err
+}
+
+func (dc *DecortClient) getToken(ctx context.Context) error {
+	dc.mutex.Lock()
+	defer dc.mutex.Unlock()
+
+	// new token is not needed
+	if dc.cfg.Token != "" && !time.Now().After(dc.expiryTime) {
+		return nil
+	}
+
+	// set up request headers and body
+	body := fmt.Sprintf("grant_type=client_credentials&client_id=%s&client_secret=%s&response_type=id_token", dc.cfg.AppID, dc.cfg.AppSecret)
+	bodyReader := strings.NewReader(body)
+
+	dc.cfg.SSOURL = strings.TrimSuffix(dc.cfg.SSOURL, "/")
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", dc.cfg.SSOURL+"/v1/oauth/access_token", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// request token
 	resp, err := dc.client.Do(req)
-	if err != nil {
-		return nil, err
+	if err != nil || resp == nil {
+		return fmt.Errorf("cannot get token: %w", err)
 	}
 	defer resp.Body.Close()
 
-	respBytes, err := io.ReadAll(resp.Body)
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("cannot get token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("cannot get token: %s", tokenBytes)
+	}
+
+	// save token in config
+	token := string(tokenBytes)
+	expiryTime, err := getTokenExp(token)
+	if err != nil {
+		return fmt.Errorf("cannot get expiry time: %w", err)
+	}
+
+	dc.cfg.Token = token
+	dc.expiryTime = expiryTime
+
+	return nil
+}
+
+// do method performs request and returns response as an array of bytes and nil error in case of response status code 200.
+// In any other cases do returns nil response and error.
+// Retries are implemented in case of connection reset errors.
+func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
+	// set up request headers and body
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	if ctype != "" {
+		req.Header.Set("Content-Type", ctype)
+	}
+
+	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
+	req.Header.Set("Accept", "application/json")
+
+	buf, err := io.ReadAll(req.Body)
 	if err != nil {
 		return nil, err
 	}
 
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := dc.client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
 	}
 
-	return respBytes, nil
+	// retries logic GOES HERE
+	// get http response
+	//var resp *http.Response
+	//for i := uint64(0); i < dc.cfg.Retries; i++ {
+	//	req := req.Clone(req.Context())
+	//	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	//
+	//	if i > 0 {
+	//		time.Sleep(5 * time.Second) // no time sleep for the first request
+	//	}
+	//
+	//	resp, err = dc.client.Do(req)
+	//
+	//	// stop retries on success and close response body
+	//	if resp != nil {
+	//		defer resp.Body.Close()
+	//	}
+	//	if err == nil {
+	//		break
+	//	}
+	//
+	//	// retries in case of connection errors with time sleep
+	//	if isConnectionError(err) {
+	//		continue
+	//	}
+	//
+	//	// return error in case of non-connection error
+	//	return nil, err
+	//}
+
+	// handle http request errors
+	if err != nil {
+		return nil, err
+	}
+	if resp == nil {
+		return nil, fmt.Errorf("got empty response without error")
+	}
+
+	// handle successful request
+	respBytes, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with status code other than 200
+	err = fmt.Errorf("%s", respBytes)
+	return nil, fmt.Errorf("could not execute request: %w", err)
+}
+
+// isConnectionError checks if given error falls within specific and associated connection errors
+//func isConnectionError(err error) bool {
+//	if strings.Contains(err.Error(), "connection reset by peer") {
+//		return true
+//	}
+//	if errors.Is(err, io.EOF) {
+//		return true
+//	}
+//
+//	return false
+//}
+
+// multiPartReq writes the request structure to the request body, and also returns string of the content-type
+func multiPartReq(params interface{}) (*bytes.Buffer, string, error) {
+	reqBody := &bytes.Buffer{}
+	writer := multipart.NewWriter(reqBody)
+	values := reflect.ValueOf(params)
+	types := values.Type()
+	defer writer.Close()
+	for i := 0; i < values.NumField(); i++ {
+		if !values.Field(i).IsValid() {
+			continue
+		}
+
+		if values.Field(i).IsZero() {
+			continue
+		}
+
+		if file, ok := constants.FileName[types.Field(i).Name]; ok {
+			part, err := writer.CreateFormFile(trimString(types.Field(i)), file)
+			if err != nil {
+				return &bytes.Buffer{}, "", err
+			}
+			_, err = io.Copy(part, strings.NewReader(valueToString(values.Field(i).Interface())))
+			if err != nil {
+				return &bytes.Buffer{}, "", err
+			}
+			continue
+		}
+
+		if values.Field(i).Type().Kind() == reflect.Slice {
+			switch slice := values.Field(i).Interface().(type) {
+			case []string:
+				if validators.IsInSlice(trimString(types.Field(i)), constants.K8sValues) {
+					code, err := json.Marshal(slice)
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+					err = writer.WriteField(trimString(types.Field(i)), string(code))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				} else {
+					for _, val := range slice {
+						err := writer.WriteField(trimString(types.Field(i)), val)
+						if err != nil {
+							return &bytes.Buffer{}, "", err
+						}
+					}
+				}
+			case []uint:
+				for _, val := range slice {
+					err := writer.WriteField(trimString(types.Field(i)), strconv.FormatUint(uint64(val), 10))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				}
+			case []uint64:
+				for _, val := range slice {
+					err := writer.WriteField(trimString(types.Field(i)), strconv.FormatUint(val, 10))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				}
+			case []map[string]interface{}:
+				for _, val := range slice {
+					encodeStr, err := json.Marshal(val)
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+					err = writer.WriteField(trimString(types.Field(i)), string(encodeStr))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				}
+			default:
+				return &bytes.Buffer{}, "", fmt.Errorf("unsupported slice type:%T", slice)
+			}
+			continue
+		}
+
+		err := writer.WriteField(trimString(types.Field(i)), valueToString(values.Field(i).Interface()))
+		if err != nil {
+			return &bytes.Buffer{}, "", err
+		}
+	}
+	ct := writer.FormDataContentType()
+	return reqBody, ct, nil
+}
+
+func valueToString(a any) string {
+	switch str := a.(type) {
+	case string:
+		return str
+	case uint:
+		return strconv.FormatUint(uint64(str), 10)
+	case uint64:
+		return strconv.FormatUint(str, 10)
+	case bool:
+		return strconv.FormatBool(str)
+	default:
+		return ""
+	}
+}
+
+func trimString(el reflect.StructField) string {
+	return strings.TrimSuffix(el.Tag.Get("url"), ",omitempty")
+}
+
+func trimConfig(cfg *config.Config) config.Config {
+	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
+	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
+	return *cfg
+}
+
+func getTokenExp(token string) (time.Time, error) {
+	parts := strings.Split(token, ".")
+	if len(parts) != 3 {
+		return time.Time{}, fmt.Errorf("invalid token format")
+	}
+
+	payload, err := base64.RawURLEncoding.DecodeString(parts[1])
+	if err != nil {
+		return time.Time{}, fmt.Errorf("error decode payload from token: %w", err)
+	}
+
+	var claims map[string]interface{}
+	if err := json.Unmarshal(payload, &claims); err != nil {
+		return time.Time{}, err
+	}
+
+	exp, ok := claims["exp"]
+	if !ok {
+		return time.Time{}, fmt.Errorf("exp time bot found")
+	}
+
+	expTime := time.Unix(int64(exp.(float64)), 0)
+
+	return expTime, nil
 }

client_bvs.go

@@ -0,0 +1,461 @@
+package decortsdk
+
+import (
+	"bytes"
+	"context"
+	"crypto/tls"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/google/go-querystring/query"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
+)
+
+// BVSDecortClient is HTTP-client for platform
+type BVSDecortClient struct {
+	client    *http.Client
+	cfg       config.BVSConfig
+	mutex     *sync.Mutex
+	decortURL string
+}
+
+type tokenJSON struct {
+	AccessToken  string `json:"access_token"`
+	TokenType    string `json:"token_type"`
+	RefreshToken string `json:"refresh_token"`
+	ExpiresIn    uint64 `json:"expires_in"`
+}
+
+// Сlient builder
+func NewBVS(cfg config.BVSConfig) *BVSDecortClient {
+	if cfg.Retries == 0 {
+		cfg.Retries = 5
+	}
+	if cfg.TimeToRefresh == 0 {
+		cfg.TimeToRefresh = 1
+	}
+
+	return &BVSDecortClient{
+		decortURL: cfg.DecortURL,
+		client: &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					//nolint:gosec
+					InsecureSkipVerify: cfg.SSLSkipVerify,
+				},
+			},
+		},
+		cfg:   trimBVSConfig(&cfg),
+		mutex: &sync.Mutex{},
+	}
+}
+
+// CloudAPI builder
+func (bdc *BVSDecortClient) CloudAPI() *cloudapi.CloudAPI {
+	return cloudapi.New(bdc)
+}
+
+// CloudBroker builder
+func (bdc *BVSDecortClient) CloudBroker() *cloudbroker.CloudBroker {
+	return cloudbroker.New(bdc)
+}
+
+// DecortApiCall method for sending requests to the platform
+func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+	var body *bytes.Buffer
+	var ctype string
+
+	byteSlice, ok := params.([]byte)
+	if ok {
+		body = bytes.NewBuffer(byteSlice)
+		// ctype = "application/x-iso9660-image"
+		ctype = "application/octet-stream"
+	} else {
+		values, err := query.Values(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBufferString(values.Encode())
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if bdc.cfg.Token.AccessToken == "" {
+		if _, err = bdc.GetToken(ctx); err != nil {
+			return nil, err
+		}
+	}
+
+	// refresh token
+	if bdc.cfg.Token.RefreshToken != "" && bdc.cfg.Token.Expiry.Add(-time.Duration(bdc.cfg.TimeToRefresh)*time.Minute).Before(time.Now()) {
+		if _, err := bdc.RefreshToken(ctx); err != nil {
+			if _, err = bdc.GetToken(ctx); err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	// perform request
+	reqCopy := req.Clone(ctx)
+	respBytes, err := bdc.do(req, ctype)
+	if err == nil {
+		return respBytes, nil
+	}
+
+	// get token and retry in case of access denied
+	if err.Error() == "access is denied" {
+		_, err = bdc.GetToken(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		respBytes, err = bdc.do(reqCopy, "")
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return respBytes, err
+}
+
+// DecortApiCallCtype method for sending requests to the platform with content type
+func (bdc *BVSDecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
+	var body *bytes.Buffer
+
+	switch ctype {
+	case constants.MIMESTREAM:
+		body = bytes.NewBuffer(params.([]byte))
+	case constants.MIMEJSON:
+		jsonBody, err := json.Marshal(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBuffer(jsonBody)
+	default:
+		ctype = constants.MIMEPOSTForm
+		values, err := query.Values(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBufferString(values.Encode())
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if bdc.cfg.Token.AccessToken == "" {
+		if _, err = bdc.GetToken(ctx); err != nil {
+			return nil, err
+		}
+	}
+
+	// refresh token
+	if bdc.cfg.Token.RefreshToken != "" && bdc.cfg.Token.Expiry.Add(-time.Duration(bdc.cfg.TimeToRefresh)*time.Minute).Before(time.Now()) {
+		if _, err := bdc.RefreshToken(ctx); err != nil {
+			if _, err = bdc.GetToken(ctx); err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	// perform request
+	reqCopy := req.Clone(ctx)
+	respBytes, err := bdc.do(req, ctype)
+	if err == nil {
+		return respBytes, nil
+	}
+
+	// get token and retry in case of access denied
+	if err.Error() == "access is denied" {
+		_, err = bdc.GetToken(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		respBytes, err = bdc.do(reqCopy, "")
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return respBytes, err
+}
+
+func (bdc *BVSDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+	body, ctype, err := multiPartReq(params)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if bdc.cfg.Token.AccessToken == "" {
+		if _, err = bdc.GetToken(ctx); err != nil {
+			return nil, err
+		}
+	}
+
+	// refresh token
+	if bdc.cfg.Token.RefreshToken != "" && bdc.cfg.Token.Expiry.Add(-time.Duration(bdc.cfg.TimeToRefresh)*time.Minute).Before(time.Now()) {
+		if _, err := bdc.RefreshToken(ctx); err != nil {
+			if _, err = bdc.GetToken(ctx); err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	// perform request
+	reqCopy := req.Clone(ctx)
+	respBytes, err := bdc.do(req, ctype)
+	if err == nil {
+		return respBytes, nil
+	}
+
+	// get token and retry in case of access denied
+	if err.Error() == "access is denied" {
+		_, err = bdc.GetToken(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		respBytes, err = bdc.do(reqCopy, ctype)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return respBytes, err
+}
+
+// GetToken allows you to get a token and returns the token structure. When specifying the PathCfg variable,
+// the token and configuration will be written to a file.
+// When specifying the PathToken variable, the token will be written to a file.
+func (bdc *BVSDecortClient) GetToken(ctx context.Context) (config.Token, error) {
+	bdc.mutex.Lock()
+	defer bdc.mutex.Unlock()
+
+	// set up request headers and body
+	body := fmt.Sprintf("grant_type=password&client_id=%s&client_secret=%s&username=%s&password=%s&response_type=token&scope=openid", bdc.cfg.AppID, bdc.cfg.AppSecret, bdc.cfg.Username, bdc.cfg.Password)
+	bodyReader := strings.NewReader(body)
+
+	bdc.cfg.SSOURL = strings.TrimSuffix(bdc.cfg.SSOURL, "/")
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", bdc.cfg.SSOURL+"/realms/"+bdc.cfg.Domain+"/protocol/openid-connect/token", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// request token
+	resp, err := bdc.client.Do(req)
+	if err != nil || resp == nil {
+		return config.Token{}, fmt.Errorf("cannot get token: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return config.Token{}, fmt.Errorf("cannot get token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return config.Token{}, fmt.Errorf("cannot get token: %s", tokenBytes)
+	}
+
+	// save token in config
+	var tj tokenJSON
+	if err = json.Unmarshal(tokenBytes, &tj); err != nil {
+		return config.Token{}, fmt.Errorf("cannot unmarshal token: %w", err)
+	}
+
+	bdc.cfg.Token = config.Token{
+		AccessToken:  tj.AccessToken,
+		TokenType:    tj.TokenType,
+		RefreshToken: tj.RefreshToken,
+		Expiry:       tj.expiry(),
+	}
+
+	if bdc.cfg.PathCfg != "" {
+		ser, _ := bdc.cfg.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathCfg)
+	}
+
+	if bdc.cfg.PathToken != "" {
+		ser, _ := bdc.cfg.Token.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathToken)
+	}
+
+	return bdc.cfg.Token, nil
+}
+
+// RefreshToken allows you to refresh a token and returns the token structure. When specifying the PathCfg variable,
+// the token and configuration will be written to a file.
+// When specifying the PathToken variable, the token will be written to a file
+func (bdc *BVSDecortClient) RefreshToken(ctx context.Context) (config.Token, error) {
+	bdc.mutex.Lock()
+	defer bdc.mutex.Unlock()
+
+	// set up request headers and body
+	body := fmt.Sprintf("grant_type=refresh_token&client_id=%s&client_secret=%s&refresh_token=%s&scope=openid", bdc.cfg.AppID, bdc.cfg.AppSecret, bdc.cfg.Token.RefreshToken)
+	bodyReader := strings.NewReader(body)
+
+	bdc.cfg.SSOURL = strings.TrimSuffix(bdc.cfg.SSOURL, "/")
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", bdc.cfg.SSOURL+"/realms/"+bdc.cfg.Domain+"/protocol/openid-connect/token", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// refresh token
+	resp, err := bdc.client.Do(req)
+	if err != nil || resp == nil {
+		return config.Token{}, fmt.Errorf("cannot refresh token: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return config.Token{}, fmt.Errorf("cannot refresh token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return config.Token{}, fmt.Errorf("cannot refresh token: %s", tokenBytes)
+	}
+
+	// save token in config
+	var tj tokenJSON
+	if err = json.Unmarshal(tokenBytes, &tj); err != nil {
+		return config.Token{}, fmt.Errorf("cannot unmarshal after refresh token: %w", err)
+	}
+
+	bdc.cfg.Token = config.Token{
+		AccessToken:  tj.AccessToken,
+		TokenType:    tj.TokenType,
+		RefreshToken: tj.RefreshToken,
+		Expiry:       tj.expiry(),
+	}
+
+	if bdc.cfg.PathCfg != "" {
+		ser, _ := bdc.cfg.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathCfg)
+	}
+
+	if bdc.cfg.PathToken != "" {
+		ser, _ := bdc.cfg.Token.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathToken)
+	}
+
+	return bdc.cfg.Token, nil
+}
+
+func (e *tokenJSON) expiry() (t time.Time) {
+	if v := e.ExpiresIn; v != 0 {
+		return time.Now().Add(time.Duration(v) * time.Second)
+	}
+	return
+}
+
+// do method performs request and returns response as an array of bytes and nil error in case of response status code 200.
+// In any other cases do returns nil response and error.
+// Retries are implemented in case of connection reset errors.
+func (bdc *BVSDecortClient) do(req *http.Request, ctype string) ([]byte, error) {
+	// set up request headers and body
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	if ctype != "" {
+		req.Header.Set("Content-Type", ctype)
+	}
+
+	req.Header.Add("Authorization", "bearer "+bdc.cfg.Token.AccessToken)
+	req.Header.Set("Accept", "application/json")
+
+	buf, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := bdc.client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
+
+	// retries logic GOES HERE
+	// get http response
+	//var resp *http.Response
+	//for i := uint64(0); i < bdc.cfg.Retries; i++ {
+	//	req := req.Clone(req.Context())
+	//	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	//
+	//	if i > 0 {
+	//		time.Sleep(5 * time.Second) // no time sleep for the first request
+	//	}
+	//
+	//	resp, err = bdc.client.Do(req)
+	//
+	//	// stop retries on success and close response body
+	//	if resp != nil {
+	//		defer resp.Body.Close()
+	//	}
+	//	if err == nil {
+	//		break
+	//	}
+	//
+	//	// retries in case of connection errors with time sleep
+	//	if isConnectionError(err) {
+	//		continue
+	//	}
+	//
+	//	// return error in case of non-connection error
+	//	return nil, err
+	//}
+
+	// handle http request errors
+	if err != nil {
+		return nil, err
+	}
+	if resp == nil {
+		return nil, fmt.Errorf("got empty response without error")
+	}
+
+	var respBytes []byte
+	respBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	// handle access denied and successful request
+	if resp.StatusCode == 401 {
+		return respBytes, errors.New("access is denied")
+	}
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with other status codes
+	err = fmt.Errorf("%s", respBytes)
+	return nil, fmt.Errorf("could not execute request: %w", err)
+}
+
+func trimBVSConfig(cfg *config.BVSConfig) config.BVSConfig {
+	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
+	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
+	return *cfg
+}

config/config.go

@@ -42,7 +42,7 @@ type Config struct {
 	// Required: false
 	Retries uint64 `json:"retries" yaml:"retries"`
 
-	// Skip verify, true by default
+	// Skip verify
 	// Required: false
 	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
 
@@ -72,9 +72,7 @@ func ParseConfigJSON(path string) (Config, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return Config{}, validators.ValidationError(validationError)
-		}
+		return Config{}, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	return config, nil
@@ -96,9 +94,7 @@ func ParseConfigYAML(path string) (Config, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return Config{}, validators.ValidationError(validationError)
-		}
+		return Config{}, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	return config, nil

config/config_bvs.go

@@ -0,0 +1,216 @@
+package config
+
+import (
+	"encoding/json"
+	"os"
+	"time"
+
+	"gopkg.in/yaml.v3"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type BVSConfig struct {
+	// ServiceAccount username
+	// Required: true
+	// Example : "osh_mikoev"
+	Username string `json:"username" yaml:"username" validate:"required"`
+
+	// ServiceAccount password
+	// Required: true
+	// Example: "[1o>hYkjnJr)HI78q7t&#%8Lm"
+	Password string `json:"password" yaml:"password" validate:"required"`
+
+	// Domain name
+	// Required: true
+	// Example: "dynamix"
+	Domain string `json:"domain" yaml:"domain" validate:"required"`
+
+	// Application (client) identifier for authorization
+	// in the cloud platform controller in oauth2 mode.
+	// Required: true
+	// Example: "ewqfrvea7s890avw804389qwguf234h0otfi3w4eiu"
+	AppID string `json:"appId" yaml:"appId" validate:"required"`
+
+	// Application (client) secret code for authorization
+	// in the cloud platform controller in oauth2 mode.
+	// Example: "frvet09rvesfis0c9erv9fsov0vsdfi09ovds0f"
+	AppSecret string `json:"appSecret" yaml:"appSecret" validate:"required"`
+
+	// Platform authentication service address
+	// Required: true
+	// Example: "https://sso.digitalenergy.online"
+	SSOURL string `json:"ssoUrl" yaml:"ssoUrl" validate:"url"`
+
+	// The address of the platform on which the actions are planned
+	// Required: true
+	// Example: "https://mr4.digitalenergy.online"
+	DecortURL string `json:"decortUrl" yaml:"decortUrl" validate:"url"`
+
+	// JWT platform token
+	// Required: false
+	// Example: "qwqwdfwv68979we0q9bfv7e9sbvd89798qrwv97ff"
+	Token Token `json:"token" yaml:"token"`
+
+	// Amount platform request attempts
+	// Default value: 5
+	// Required: false
+	Retries uint64 `json:"retries" yaml:"retries"`
+
+	// Skip verify
+	// Required: false
+	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
+
+	// HTTP client timeout, unlimited if left empty
+	// Required: false
+	Timeout Duration `json:"timeout" yaml:"timeout"`
+
+	// The path of the configuration file entry
+	// Required: false
+	PathCfg string `json:"path_cfg" yaml:"path_cfg"`
+
+	// The path of the token file entry
+	// Required: false
+	PathToken string `json:"path_token" yaml:"path_token"`
+
+	// The number of minutes before the expiration of the token, a refresh will be made
+	// Required: false
+	TimeToRefresh int64 `json:"timeToRefresh" yaml:"timeToRefresh"`
+}
+
+type Token struct {
+	// AccessToken is the token that authorizes and authenticates
+	// the requests.
+	// Required: false
+	AccessToken string `json:"access_token" yaml:"access_token"`
+
+	// TokenType is the type of token.
+	// The Type method returns either this or "Bearer", the default.
+	// Required: false
+	TokenType string `json:"token_type" yaml:"token_type"`
+
+	// RefreshToken is a token that's used by the application
+	// (as opposed to the user) to refresh the access token
+	// if it expires.
+	// Required: false
+	RefreshToken string `json:"refresh_token" yaml:"refresh_token"`
+
+	// Expiry is the optional expiration time of the access token.
+	// Required: false
+	Expiry time.Time `json:"expiry" yaml:"expiry"`
+}
+
+// SetTimeout is used to set HTTP client timeout.
+func (c *BVSConfig) SetTimeout(dur time.Duration) {
+	c.Timeout = Duration(dur)
+}
+
+// ParseConfigJSON parses Config from specified JSON-formatted file.
+func ParseConfigBVSJSON(path string) (BVSConfig, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return BVSConfig{}, err
+	}
+
+	var config BVSConfig
+
+	err = json.Unmarshal(file, &config)
+	if err != nil {
+		return BVSConfig{}, err
+	}
+
+	err = validators.ValidateConfig(config)
+	if err != nil {
+		return BVSConfig{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return config, nil
+}
+
+// ParseConfigJSON parses Token from specified JSON-formatted file.
+func ParseTokenBVSJSON(path string) (Token, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Token{}, err
+	}
+
+	var token Token
+
+	err = json.Unmarshal(file, &token)
+	if err != nil {
+		return Token{}, err
+	}
+
+	err = validators.ValidateConfig(token)
+	if err != nil {
+		return Token{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return token, nil
+}
+
+// ParseTokenBVSYAML parses Token from specified YAML-formatted file.
+func ParseTokenBVSYAML(path string) (Token, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Token{}, err
+	}
+
+	var token Token
+
+	err = yaml.Unmarshal(file, &token)
+	if err != nil {
+		return Token{}, err
+	}
+
+	err = validators.ValidateConfig(token)
+	if err != nil {
+		return Token{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return token, nil
+}
+
+// ParseConfigYAML parses Config from specified YAML-formatted file.
+func ParseConfigBVSYAML(path string) (BVSConfig, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return BVSConfig{}, err
+	}
+
+	var config BVSConfig
+
+	err = yaml.Unmarshal(file, &config)
+	if err != nil {
+		return BVSConfig{}, err
+	}
+
+	err = validators.ValidateConfig(config)
+	if err != nil {
+		return BVSConfig{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return config, nil
+}
+
+func (t Token) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(t, prefix, indent)
+	}
+
+	return json.Marshal(t)
+}
+
+func (c BVSConfig) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(c, prefix, indent)
+	}
+
+	return json.Marshal(c)
+}

config/legacy-config.go

@@ -36,7 +36,7 @@ type LegacyConfig struct {
 	// Required: false
 	Retries uint64 `json:"retries" yaml:"retries"`
 
-	// Skip verify, true by default
+	// Skip verify
 	// Required: false
 	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
 
@@ -66,9 +66,7 @@ func ParseLegacyConfigJSON(path string) (LegacyConfig, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return LegacyConfig{}, validators.ValidationError(validationError)
-		}
+		return LegacyConfig{}, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	return config, nil
@@ -90,9 +88,7 @@ func ParseLegacyConfigYAML(path string) (LegacyConfig, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return LegacyConfig{}, validators.ValidationError(validationError)
-		}
+		return LegacyConfig{}, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	return config, nil

config/timeouts.go

@@ -22,8 +22,10 @@ func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		}
 		*d = Duration(tmp)
 		return nil
+	case float64:
+		return nil
 	default:
-		return fmt.Errorf("Invalid duration %v", value)
+		return fmt.Errorf("invalid duration %v", value)
 	}
 }
 
@@ -40,8 +42,10 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 		}
 		*d = Duration(tmp)
 		return nil
+	case float64:
+		return nil
 	default:
-		return fmt.Errorf("Invalid duration %v", value)
+		return fmt.Errorf("invalid duration %v", value)
 	}
 }
 

config/universal-config.go

@@ -0,0 +1,8 @@
+package config
+
+// UniversalConfig combines configurations for different types of clients
+type UniversalConfig struct {
+	Decs3oConfig *Config       `json:"decs3oConfig,omitempty" yaml:"decs3oConfig,omitempty"`
+	BVSConfig    *BVSConfig    `json:"bvsConfig,omitempty" yaml:"bvsConfig,omitempty"`
+	LegacyConfig *LegacyConfig `json:"legacyConfig,omitempty" yaml:"legacyConfig,omitempty"`
+}

go.mod

@@ -5,15 +5,17 @@ go 1.20
 require (
 	github.com/go-playground/validator/v10 v10.11.2
 	github.com/google/go-querystring v1.1.0
+	github.com/joho/godotenv v1.5.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -8,10 +8,13 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
 github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -23,12 +26,12 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

interfaces/caller.go

@@ -6,4 +6,10 @@ import "context"
 type Caller interface {
 	// DecortApiCall method for sending requests to the platform
 	DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error)
+
+	// DecortApiCallCtype method for sending requests to the platform
+	DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error)
+
+	// DecortApiCallMP method for sending requests to the platform
+	DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error)
 }

interfaces/request.go

@@ -0,0 +1,7 @@
+package interfaces
+
+// Interface to valiate RAM values
+type RequestWithRAM interface {
+	// GetRAM returns RAM values
+	GetRAM() map[string]uint64
+}

internal/client/http-client.go

@@ -1,42 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"net/http"
-	"sync"
-	"time"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-)
-
-func NewHttpClient(cfg config.Config) *http.Client {
-
-	transCfg := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			//nolint:gosec
-			InsecureSkipVerify: cfg.SSLSkipVerify,
-		},
-	}
-
-	var expiredTime time.Time
-
-	if cfg.Token != "" {
-		expiredTime = time.Now().AddDate(0, 0, 1)
-	}
-
-	return &http.Client{
-		Transport: &transport{
-			base:         transCfg,
-			retries:      cfg.Retries,
-			clientID:     cfg.AppID,
-			clientSecret: cfg.AppSecret,
-			ssoURL:       cfg.SSOURL,
-			token:        cfg.Token,
-			expiryTime:   expiredTime,
-			mutex:        &sync.Mutex{},
-			//TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-
-		Timeout: cfg.Timeout.Get(),
-	}
-}

internal/client/legacy-http-client.go

@@ -1,42 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"net/http"
-	"net/url"
-	"sync"
-	"time"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-)
-
-// NewLegacyHttpClient creates legacy HTTP Client
-func NewLegacyHttpClient(cfg config.LegacyConfig) *http.Client {
-	transCfg := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			//nolint:gosec
-			InsecureSkipVerify: cfg.SSLSkipVerify,
-		},
-	}
-
-	var expiredTime time.Time
-
-	if cfg.Token != "" {
-		expiredTime = time.Now().AddDate(0, 0, 1)
-	}
-
-	return &http.Client{
-		Transport: &transportLegacy{
-			base:       transCfg,
-			username:   url.QueryEscape(cfg.Username),
-			password:   url.QueryEscape(cfg.Password),
-			retries:    cfg.Retries,
-			token:      cfg.Token,
-			decortURL:  cfg.DecortURL,
-			expiryTime: expiredTime,
-			mutex:      &sync.Mutex{},
-		},
-
-		Timeout: cfg.Timeout.Get(),
-	}
-}

internal/client/legacy-transport.go

@@ -1,78 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
-)
-
-type transportLegacy struct {
-	base       http.RoundTripper
-	username   string
-	password   string
-	retries    uint64
-	token      string
-	decortURL  string
-	mutex      *sync.Mutex
-	expiryTime time.Time
-}
-
-func (t *transportLegacy) RoundTrip(request *http.Request) (*http.Response, error) {
-	if t.token == "" || time.Now().After(t.expiryTime) {
-		body := fmt.Sprintf("username=%s&password=%s", t.username, t.password)
-		bodyReader := strings.NewReader(body)
-
-		req, _ := http.NewRequestWithContext(request.Context(), "POST", t.decortURL+"/restmachine/cloudapi/user/authenticate", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-
-		resp, err := t.base.RoundTrip(req)
-		if err != nil {
-			return nil, fmt.Errorf("unable to get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return nil, fmt.Errorf("unable to get token: %s", tokenBytes)
-		}
-
-		token := string(tokenBytes)
-		t.token = token
-		t.expiryTime = time.Now().AddDate(0, 0, 1)
-	}
-
-	tokenValue := fmt.Sprintf("&authkey=%s", t.token)
-	tokenReader := strings.NewReader(tokenValue)
-
-	newBody := io.MultiReader(request.Body, tokenReader)
-
-	req, _ := http.NewRequestWithContext(request.Context(), request.Method, request.URL.String(), newBody)
-
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Accept", "application/json")
-
-	var resp *http.Response
-	var err error
-	for i := uint64(0); i < t.retries; i++ {
-		t.mutex.Lock()
-		resp, err = t.base.RoundTrip(req)
-		t.mutex.Unlock()
-		if err == nil {
-			if resp.StatusCode == 200 {
-				return resp, nil
-			}
-			respBytes, _ := io.ReadAll(resp.Body)
-			err = fmt.Errorf("%s", respBytes)
-			resp.Body.Close()
-		}
-		if err != nil {
-			return nil, fmt.Errorf("could not execute request: %w", err)
-		}
-		time.Sleep(time.Second * 5)
-	}
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}

internal/client/transport.go

@@ -1,74 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
-)
-
-type transport struct {
-	base         http.RoundTripper
-	retries      uint64
-	clientID     string
-	clientSecret string
-	token        string
-	ssoURL       string
-	expiryTime   time.Time
-	mutex        *sync.Mutex
-}
-
-func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	if t.token == "" || time.Now().After(t.expiryTime) {
-		body := fmt.Sprintf("grant_type=client_credentials&client_id=%s&client_secret=%s&response_type=id_token", t.clientID, t.clientSecret)
-		bodyReader := strings.NewReader(body)
-
-		t.ssoURL = strings.TrimSuffix(t.ssoURL, "/")
-
-		req, _ := http.NewRequestWithContext(req.Context(), "POST", t.ssoURL+"/v1/oauth/access_token", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-
-		resp, err := t.base.RoundTrip(req)
-		if err != nil {
-			return nil, fmt.Errorf("cannot get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return nil, fmt.Errorf("cannot get token: %s", tokenBytes)
-		}
-
-		token := string(tokenBytes)
-
-		t.token = token
-		t.expiryTime = time.Now().AddDate(0, 0, 1)
-	}
-
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Add("Authorization", "bearer "+t.token)
-	req.Header.Set("Accept", "application/json")
-
-	var resp *http.Response
-	var err error
-	for i := uint64(0); i < t.retries; i++ {
-		t.mutex.Lock()
-		resp, err = t.base.RoundTrip(req)
-		t.mutex.Unlock()
-		if err == nil {
-			if resp.StatusCode == 200 {
-				return resp, nil
-			}
-			respBytes, _ := io.ReadAll(resp.Body)
-			err = fmt.Errorf("%s", respBytes)
-			resp.Body.Close()
-		}
-		//logrus.Errorf("Could not execute request: %v. Retrying %d/%d", err, i+1, t.retries)
-		time.Sleep(time.Second * 5)
-	}
-
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}

internal/constants/constants.go

@@ -0,0 +1,36 @@
+package constants
+
+const (
+	RESTMACHINE = "/restmachine"
+)
+
+const (
+	MIMEJSON              = "application/json"
+	MIMEHTML              = "text/html"
+	MIMEXML               = "application/xml"
+	MIMEXML2              = "text/xml"
+	MIMEPlain             = "text/plain"
+	MIMEPOSTForm          = "application/x-www-form-urlencoded"
+	MIMEMultipartPOSTForm = "multipart/form-data"
+	MIMEPROTOBUF          = "application/x-protobuf"
+	MIMEMSGPACK           = "application/x-msgpack"
+	MIMEMSGPACK2          = "application/msgpack"
+	MIMEYAML              = "application/x-yaml"
+	MIMEYAML2             = "application/yaml"
+	MIMETOML              = "application/toml"
+	MIMESTREAM            = "application/octet-stream"
+)
+
+var FileName = map[string]string{
+	"OidcCertificate": "ca.crt",
+}
+
+var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
+
+var VersionMap = map[string]string{
+	"4.4.0": "-",
+	"4.3.0": "-",
+	"4.2.0": "-",
+	"4.1.1": "-",
+	"4.1.0": "-",
+}

internal/multierror/join.go

@@ -0,0 +1,41 @@
+package multierror
+
+func Join(errs ...error) error {
+	n := 0
+	for _, err := range errs {
+		if err != nil {
+			n++
+		}
+	}
+	if n == 0 {
+		return nil
+	}
+	e := &joinError{
+		errs: make([]error, 0, n),
+	}
+	for _, err := range errs {
+		if err != nil {
+			e.errs = append(e.errs, err)
+		}
+	}
+	return e
+}
+
+type joinError struct {
+	errs []error
+}
+
+func (e *joinError) Error() string {
+	var b []byte
+	for i, err := range e.errs {
+		if i > 0 {
+			b = append(b, '\n')
+		}
+		b = append(b, err.Error()...)
+	}
+	return string(b)
+}
+
+func (e *joinError) Unwrap() []error {
+	return e.errs
+}

internal/validators/custom.go

@@ -1,31 +1,38 @@
 package validators
 
 import (
+	"errors"
+	"fmt"
+	"net/url"
+	"reflect"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
 )
 
-// computeDriverValidator is used to validate Driver field in kvmx86/kvmppc create.
-func computeDriverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, computeDriverValues)
-}
-
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, protoValues)
+	return IsInSlice(fieldValue, protoValues)
+}
+
+// apiGroupValidator is used to validate APIGroup fields
+func apiGroupValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, apiGroupValues)
 }
 
 // accessTypeValidator is used to validate AccessType fields.
 func accessTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, accessTypeValues)
+	return IsInSlice(fieldValue, accessTypeValues)
 }
 
 // resTypesValidator is used to validate ResTypes fields.
@@ -36,7 +43,7 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !StringInSlice(value, resTypesValues) {
+		if !IsInSlice(value, resTypesValues) {
 			return false
 		}
 	}
@@ -44,60 +51,81 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	return true
 }
 
-// driverValidator is used to validate Driver fields.
-func driverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, driverValues)
-}
-
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, accountCUTypeValues)
+	return IsInSlice(fieldValue, accountCUTypeValues)
 }
 
 // bserviceModeValidator is used to validate Mode field.
 func bserviceModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, bserviceModeValues)
+	return IsInSlice(fieldValue, bserviceModeValues)
 }
 
 // computeTopologyValidator is used to validate Topology field.
 func computeTopologyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeTopologyValues)
+	return IsInSlice(fieldValue, computeTopologyValues)
 }
 
 // computePolicyValidator is used to validate Policy field.
 func computePolicyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computePolicyValues)
+	return IsInSlice(fieldValue, computePolicyValues)
 }
 
 // computeModeValidator is used to validate Mode field.
 func computeModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeModeValues)
+	return IsInSlice(fieldValue, computeModeValues)
 }
 
 // computeDiskTypeValidator is used to validate DiskType field.
 func computeDiskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeDiskTypeValues)
+	return IsInSlice(fieldValue, computeDiskTypeValues)
 }
 
 // computeNetTypeValidator is used to validate NetType field.
 func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeNetTypeValues)
+	return IsInSlice(fieldValue, computeNetTypeValues)
+}
+
+// computex86NetTypeValidator is used to validate NetType field.
+func computex86NetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, computex86NetTypeValues)
+}
+
+// securityGroupDirectionValidator is used to validate Direction field
+func securityGroupDirectionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupDirectionValues)
+}
+
+// securityGroupEthertypeValidator is used to validate Ethertype field
+func securityGroupEthertypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupEthertypeValues)
+}
+
+// securityGroupProtocolValidator is used to validate Protocol field
+func securityGroupProtocolValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupProtocolValues)
 }
 
 // computeOrderValidator is used to validate Order field.
@@ -108,7 +136,7 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !StringInSlice(value, computeOrderValues) {
+		if !IsInSlice(value, computeOrderValues) {
 			return false
 		}
 	}
@@ -120,100 +148,84 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 func computeDataDisksValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeDataDisksValues)
+	return IsInSlice(fieldValue, computeDataDisksValues)
 }
 
 // diskTypeValidator is used to validate Type field.
 func diskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, diskTypeValues)
+	return IsInSlice(fieldValue, diskTypeValues)
 }
 
 // flipgroupClientTypeValidator is used to validate ClientType field.
 func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, flipgroupClientTypeValues)
+	return IsInSlice(fieldValue, flipgroupClientTypeValues)
 }
 
 // kvmNetTypeValidator is used to validate NetType field.
 func kvmNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, kvmNetTypeValues)
+	return IsInSlice(fieldValue, kvmNetTypeValues)
 }
 
 // lbAlgorithmValidator is used to validate Algorithm field.
 func lbAlgorithmValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, lbAlgorithmValues)
+	return IsInSlice(fieldValue, lbAlgorithmValues)
 }
 
 // rgDefNetValidator is used to validate DefNet field.
 func rgDefNetValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, rgDefNetValues)
+	return IsInSlice(fieldValue, rgDefNetValues)
 }
 
 // rgNetTypeValidator is used to validate NetType field.
 func rgNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, rgNetTypeValues)
+	return IsInSlice(fieldValue, rgNetTypeValues)
 }
 
 // vinsTypeValidator is used to validate Type field.
 func vinsTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, vinsTypeValues)
+	return IsInSlice(fieldValue, vinsTypeValues)
 }
 
 // imageBootTypeValidator is used to validate BootType field.
 func imageBootTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, imageBootTypeValues)
+	return IsInSlice(fieldValue, imageBootTypeValues)
 }
 
 // imageTypeValidator is used to validate ImageType field.
 func imageTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, imageTypeValues)
-}
-
-// imageDriversValidator is used to validate Drivers field.
-func imageDriversValidator(fe validator.FieldLevel) bool {
-	fieldSlice, ok := fe.Field().Interface().([]string)
-	if !ok {
-		return false
-	}
-
-	for _, item := range fieldSlice {
-		if !StringInSlice(item, imageDriversValues) {
-			return false
-		}
-	}
-
-	return true
+	return IsInSlice(fieldValue, imageTypeValues)
 }
 
 // imageArchitectureValidator is used to validate Architecture field.
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, imageArchitectureValues)
+	return IsInSlice(fieldValue, imageArchitectureValues)
 }
 
 // sepFieldTypeValidator is used to validate FieldType field.
 func sepFieldTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, sepFieldTypeValues)
+	return IsInSlice(fieldValue, sepFieldTypeValues)
 }
 
 // hwPathValidator is used to validate HWPath field.
@@ -230,7 +242,7 @@ func networkPluginValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return StringInSlice(fieldValue, networkPluginValues)
+	return IsInSlice(fieldValue, networkPluginValues)
 }
 
 // networkPluginsValidator is used to validate NetworkPlugins field
@@ -243,7 +255,7 @@ func networkPluginsValidator(fe validator.FieldLevel) bool {
 	for _, item := range fieldSlice {
 		item = strings.ToLower(item)
 
-		if !StringInSlice(item, networkPluginValues) {
+		if !IsInSlice(item, networkPluginValues) {
 			return false
 		}
 	}
@@ -255,14 +267,35 @@ func interfaceStateValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return StringInSlice(fieldValue, interfaceStateValues)
+	return IsInSlice(fieldValue, interfaceStateValues)
+}
+
+func interfaceTXModelValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, txModelValues)
+}
+
+func interfaceIOEventFDValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, ioEventFDValues)
+}
+
+func interfaceEventIDxValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, eventIDxValues)
 }
 
 func strictLooseValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return StringInSlice(fieldValue, strictLooseValues)
+	return IsInSlice(fieldValue, strictLooseValues)
 }
 
 // name workerGroup must be more 3 symbol
@@ -272,3 +305,155 @@ func workerGroupNameValidator(fe validator.FieldLevel) bool {
 
 	return len(fieldValue) >= 3
 }
+
+func sortByValidator(fe validator.FieldLevel) bool {
+
+	sortByRegexp := regexp.MustCompile(`^[+-][a-zA-Z_]+`)
+
+	return sortByRegexp.MatchString(fe.Field().String())
+}
+
+func actionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, actionValues)
+}
+
+func vmActionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, vmActionValues)
+}
+
+func mtuValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().Uint()
+
+	return fieldValue >= uint64(mtuMin) && fieldValue <= uint64(mtuMax)
+}
+
+func computeFeaturesValidator(fe validator.FieldLevel) bool {
+	field := fe.Field()
+	slice, ok := field.Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	return IsSubSlice(slice, computeFeaturesValues)
+}
+
+func networkInterfaceNamingValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, networkInterfaceNamingValues)
+}
+
+func numaAffinityValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, numaAffinityValues)
+}
+
+// kvmx86NetTypeValidator is used to validate NetType field for x86 compute.
+func kvmx86NetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, kvmx86NetTypeValues)
+}
+
+func isBoolTypeValidator(fe validator.FieldLevel) bool {
+	return fe.Field().CanConvert(reflect.TypeOf(true))
+}
+
+func urlValidartor(fl validator.FieldLevel) bool {
+	fieldValues := fl.Field().String()
+
+	_, err := url.ParseRequestURI(fieldValues)
+	return err == nil
+}
+
+func chipsetValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, chipsetValues)
+}
+
+func preferredCPUValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]int64)
+	if !ok {
+		return false
+	}
+
+	for _, value := range fieldSlice {
+		if value < -1 {
+			return false
+		}
+	}
+
+	return true
+}
+
+// loaderTypeValidator is used to validate loaderType fields
+func loaderTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, loaderTypeValues)
+}
+
+// languageValidator is used to validate language fields
+func languageValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, languageValues)
+}
+
+func userProviderValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, userProviders)
+}
+
+// sepTypeValidator is used to validate sepType fields
+func sepTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, sepTypeValues)
+}
+
+// deviceValidator is used to validate extnet device fields
+func deviceValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, deviceValues)
+}
+
+// ValidateRAM checks if request contains RAM value that is positive integer divisible by divisibility passed.
+// It is recommended to pass constants.RAM_DIVISIBILITY as divisility arguement
+func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
+
+	if divisibility == 0 {
+
+		return errors.New("second argument of ValidateRAM should be greater than 0")
+	}
+	mapRAM := r.GetRAM()
+
+	errs := make([]error, 0, len(mapRAM))
+
+	for k, v := range mapRAM {
+
+		if v%divisibility != 0 {
+
+			errs = append(errs, fmt.Errorf("expected value of %s: \"%d\" should be divisible by %d", k, v, divisibility))
+		}
+	}
+	return multierror.Join(errs...)
+}
+
+// trunkTagsValidator checks if trunk_tags is in range from 1 to 4095
+func trunkTagsValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	numFieldValue, err := strconv.ParseInt(fieldValue, 10, 64)
+	if err != nil {
+		return false
+	}
+	return uint64(numFieldValue) >= uint64(trunkTagsMin) && uint64(numFieldValue) <= uint64(trunkTagsMax)
+}

internal/validators/helper.go

@@ -2,6 +2,7 @@ package validators
 
 import (
 	"errors"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
 
 	"github.com/go-playground/validator/v10"
 )
@@ -20,12 +21,20 @@ func ValidationError(fe validator.FieldError) error {
 	return errors.New(errorMessage(fe))
 }
 
+func ValidationErrors(fes []validator.FieldError) error {
+	errs := make([]error, 0, len(fes))
+	for _, fe := range fes {
+		errs = append(errs, ValidationError(fe))
+	}
+	return multierror.Join(errs...)
+}
+
 //nolint:errorlint
 func GetErrors(err error) validator.ValidationErrors {
 	return err.(validator.ValidationErrors)
 }
 
-func StringInSlice(str string, target []string) bool {
+func IsInSlice(str string, target []string) bool {
 	for _, v := range target {
 		if v == str {
 			return true
@@ -33,3 +42,12 @@ func StringInSlice(str string, target []string) bool {
 	}
 	return false
 }
+
+func IsSubSlice(source []string, target []string) bool {
+	for _, s := range source {
+		if !IsInSlice(s, target) {
+			return false
+		}
+	}
+	return true
+}

internal/validators/messages.go

@@ -25,12 +25,8 @@ func errorMessage(fe validator.FieldError) string {
 		return fmt.Sprintf("%s %s: unexpected URL format", prefix, fe.Field())
 	case "email":
 		return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())
-
-	case "driver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(driverValues))
+	case "isBool":
+		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -50,6 +46,13 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(protoValues))
 
+	// apiGroup Validators
+	case "apiGroup":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(apiGroupValues))
+
 	// Account Validators
 	case "accountCUType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -89,6 +92,18 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDiskTypeValues))
 
+	case "mtu":
+		return fmt.Sprint(prefix, fe.Field(), "must be ", mtuMin, "-", mtuMax)
+
+	case "preferredCPU":
+		return fmt.Sprint(prefix, fe.Field(), "must be equal to or greater than", -1)
+
+	case "computex86NetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computex86NetTypeValues))
+
 	case "computeNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -107,12 +122,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDataDisksValues))
 
-	case "computeDriver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(computeDriverValues))
-
 	// Disk Validators
 	case "diskType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -133,7 +142,7 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
-	// KVM_X86/KVM_PPC Validators
+	// KVM_X86 Validators
 	case "kvmNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -180,12 +189,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(imageTypeValues))
 
-	case "imageDrivers":
-		return fmt.Sprintf("%s %s must contain only the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(imageDriversValues))
-
 	case "imageArchitecture":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -229,6 +232,127 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(interfaceStateValues))
+
+	case "interfaceTXModel":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(txModelValues))
+
+	case "interfaceIOEventFD":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(ioEventFDValues))
+
+	case "interfaceEventIDx":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(eventIDxValues))
+
+	case "sortBy":
+		return fmt.Sprintf("%s %s must be in format +|-(field)",
+			prefix,
+			fe.Field())
+
+	case "action":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(actionValues))
+
+	case "vmaction":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(vmActionValues))
+
+	case "computeFeatures":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computeFeaturesValues))
+
+	case "networkInterfaceNaming":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(networkInterfaceNamingValues))
+
+	case "numaAffinity":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(numaAffinityValues))
+
+	case "kvmx86NetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(kvmx86NetTypeValues))
+
+	case "chipset":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(chipsetValues))
+
+	case "loaderType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(loaderTypeValues))
+
+	case "language":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(languageValues))
+
+	case "sepType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(sepTypeValues))
+
+	// user validators
+	case "userProvider":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(userProviders))
+
+	// security group validators
+	case "securityGroupDirection":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupDirectionValues))
+
+	case "securityGroupEthertype":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupEthertypeValues))
+
+	case "securityGroupProtocol":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupProtocolValues))
+
+	// trunk tags validator
+	case "trunkTags":
+		return fmt.Sprintf("%s %s must be in range from 1 to 4095",
+			prefix,
+			fe.Field())
+
+	case "device":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(deviceValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -25,12 +25,13 @@ func getDecortValidator() *validator.Validate {
 
 // registerAllValidators registers all custom validators in DecortValidator.
 func registerAllValidators(validate *validator.Validate) error {
+
 	err := validate.RegisterValidation("proto", protoValidator)
 	if err != nil {
 		return err
 	}
 
-	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
+	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
 	if err != nil {
 		return err
 	}
@@ -45,11 +46,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("driver", driverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
 	if err != nil {
 		return err
@@ -60,11 +56,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("imageDrivers", imageDriversValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("imageArchitecture", imageArchitectureValidator)
 	if err != nil {
 		return err
@@ -105,6 +96,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("computex86NetType", computex86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("computeOrder", computeOrderValidator)
 	if err != nil {
 		return err
@@ -180,10 +176,130 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("interfaceTXModel", interfaceTXModelValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("interfaceIOEventFD", interfaceIOEventFDValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("interfaceEventIDx", interfaceEventIDxValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("workerGroupName", workerGroupNameValidator)
 	if err != nil {
 		return err
 	}
 
+	err = validate.RegisterValidation("sortBy", sortByValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("action", actionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("vmaction", vmActionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("mtu", mtuValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("computeFeatures", computeFeaturesValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("networkInterfaceNaming", networkInterfaceNamingValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("numaAffinity", numaAffinityValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("kvmx86NetType", kvmx86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("isBool", isBoolTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("url", urlValidartor)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("chipset", chipsetValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("preferredCPU", preferredCPUValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("loaderType", loaderTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("language", languageValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("userProvider", userProviderValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("sepType", sepTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("device", deviceValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("trunkTags", trunkTagsValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupDirection", securityGroupDirectionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupEthertype", securityGroupEthertypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupProtocol", securityGroupProtocolValidator)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

internal/validators/values.go

@@ -1,7 +1,8 @@
 package validators
 
 var (
-	driverValues     = []string{"KVM_X86", "KVM_PPC"}
+	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
+
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
@@ -10,38 +11,78 @@ var (
 
 	bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
 
-	computeTopologyValues  = []string{"compute", "node"}
-	computePolicyValues    = []string{"RECOMMENDED", "REQUIRED"}
-	computeModeValues      = []string{"EQ", "EN", "ANY"}
-	computeDiskTypeValues  = []string{"D", "B"}
-	computeNetTypeValues   = []string{"EXTNET", "VINS"}
-	computeOrderValues     = []string{"cdrom", "network", "hd"}
-	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
-	computeDriverValues    = []string{"KVM_X86", "SVA_KVM_X86"}
+	computeTopologyValues   = []string{"compute", "node"}
+	computePolicyValues     = []string{"RECOMMENDED", "REQUIRED"}
+	computeModeValues       = []string{"EQ", "EN", "ANY"}
+	computeDiskTypeValues   = []string{"D", "B"}
+	computeNetTypeValues    = []string{"EXTNET", "VINS"}
+	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
+	computeOrderValues      = []string{"cdrom", "network", "hd"}
+	computeDataDisksValues  = []string{"KEEP", "DETACH", "DESTROY"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
-	kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
+	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
+	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "EMPTY", "VFNIC", "DPDK", "SDN", "TRUNK"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
 	rgDefNetValues  = []string{"PRIVATE", "PUBLIC", "NONE"}
 	rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
 
-	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDE"}
+	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
-	imageTypeValues         = []string{"windows", "linux", "other"}
-	imageDriversValues      = []string{"KVM_X86"}
-	imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
+	imageTypeValues         = []string{"windows", "linux", "unknown"}
+	imageArchitectureValues = []string{"X86_64"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 
-	networkPluginValues = []string{"flannel", "weawenet", "calico"}
+	networkPluginValues = []string{"flannel", "weavenet", "calico"}
 
 	strictLooseValues = []string{"strict", "loose"}
 
 	interfaceStateValues = []string{"on", "off"}
+
+	actionValues = []string{"is_powered", "power_on", "shutdown", "force_shutdown", "reboot"}
+
+	vmActionValues = []string{"stop", "move"}
+
+	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac", "trunk"}
+
+	networkInterfaceNamingValues = []string{"eth", "ens"}
+
+	numaAffinityValues = []string{"none", "strict", "loose"}
+
+	txModelValues = []string{"iothread", "timer", "selected by hypervisor"}
+
+	ioEventFDValues = []string{"on", "off", "selected by hypervisor"}
+
+	eventIDxValues = []string{"on", "off", "selected by hypervisor"}
+
+	chipsetValues = []string{"i440fx", "Q35"}
+
+	loaderTypeValues = []string{"linux", "windows", "unknown"}
+
+	sepTypeValues = []string{"hitachi", "dorado", "tatlin", "shared", "local", "des"}
+
+	languageValues = []string{"ru", "en"}
+
+	userProviders = []string{"bvs", "decs3o"}
+
+	deviceValues = []string{"primary", "secondary"}
+
+	securityGroupDirectionValues = []string{"inbound", "outbound"}
+	securityGroupEthertypeValues = []string{"IPv4", "IPv6"}
+	securityGroupProtocolValues  = []string{"icmp", "tcp", "udp"}
+)
+
+const (
+	mtuMin = 1
+	mtuMax = 9216
+
+	trunkTagsMin = 1
+	trunkTagsMax = 4095
 )

legacy-client.go

@@ -1,23 +1,32 @@
 package decortsdk
 
 import (
+	"bytes"
 	"context"
-	"errors"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"strings"
+	"sync"
+	"time"
 
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/client"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 )
 
-// Legacy HTTP-client for platform
+// LegacyDecortClient is Legacy HTTP-client for platform
 type LegacyDecortClient struct {
-	decortURL string
-	client    *http.Client
+	decortURL  string
+	client     *http.Client
+	cfg        config.LegacyConfig
+	expiryTime time.Time
+	mutex      *sync.Mutex
 }
 
 // Legacy client builder
@@ -26,9 +35,25 @@ func NewLegacy(cfg config.LegacyConfig) *LegacyDecortClient {
 		cfg.Retries = 5
 	}
 
+	var expiryTime time.Time
+
+	if cfg.Token != "" {
+		expiryTime = time.Now().AddDate(0, 0, 1)
+	}
+
 	return &LegacyDecortClient{
 		decortURL: cfg.DecortURL,
-		client:    client.NewLegacyHttpClient(cfg),
+		client: &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					//nolint:gosec
+					InsecureSkipVerify: cfg.SSLSkipVerify,
+				},
+			},
+		},
+		cfg:        trimLegacyConfig(&cfg),
+		expiryTime: expiryTime,
+		mutex:      &sync.Mutex{},
 	}
 }
 
@@ -44,31 +69,222 @@ func (ldc *LegacyDecortClient) CloudBroker() *cloudbroker.CloudBroker {
 
 // DecortApiCall method for sending requests to the platform
 func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-	values, err := query.Values(params)
+	// get token
+	if err := ldc.getToken(ctx); err != nil {
+		return nil, err
+	}
+
+	var body *bytes.Buffer
+	var ctype string
+
+	byteSlice, ok := params.([]byte)
+	if ok {
+		body = bytes.NewBuffer(byteSlice)
+		ctype = "application/octet-stream"
+	} else {
+		values, err := query.Values(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
 	if err != nil {
 		return nil, err
 	}
 
-	body := strings.NewReader(values.Encode())
-	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, body)
+	// perform request
+	respBytes, err := ldc.do(req, ctype)
 	if err != nil {
 		return nil, err
 	}
 
+	return respBytes, err
+}
+
+// DecortApiCallCtype method for sending requests to the platform with content type
+func (ldc *LegacyDecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
+	// get token
+	if err := ldc.getToken(ctx); err != nil {
+		return nil, err
+	}
+
+	var body *bytes.Buffer
+
+	switch ctype {
+	case constants.MIMESTREAM:
+		body = bytes.NewBuffer(params.([]byte))
+	case constants.MIMEJSON:
+		jsonBody, err := json.Marshal(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBuffer(jsonBody)
+	default:
+		ctype = constants.MIMEPOSTForm
+		values, err := query.Values(params)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// perform request
+	respBytes, err := ldc.do(req, ctype)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBytes, err
+}
+
+func (ldc *LegacyDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+	body, ctype, err := multiPartReq(params)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if err = ldc.getToken(ctx); err != nil {
+		return nil, err
+	}
+
+	// perform request
+	respBytes, err := ldc.do(req, ctype)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBytes, err
+}
+
+func (ldc *LegacyDecortClient) getToken(ctx context.Context) error {
+	ldc.mutex.Lock()
+	defer ldc.mutex.Unlock()
+
+	// new token is not needed
+	if ldc.cfg.Token != "" && !time.Now().After(ldc.expiryTime) {
+		return nil
+	}
+
+	// set up request headers and body
+	body := fmt.Sprintf("username=%s&password=%s", url.QueryEscape(ldc.cfg.Username), url.QueryEscape(ldc.cfg.Password))
+	bodyReader := strings.NewReader(body)
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", ldc.cfg.DecortURL+constants.RESTMACHINE+"/cloudapi/user/authenticate", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// request token
 	resp, err := ldc.client.Do(req)
-	if err != nil {
-		return nil, err
+	if err != nil || resp == nil {
+		return fmt.Errorf("cannot get token: %w", err)
 	}
 	defer resp.Body.Close()
 
-	respBytes, err := io.ReadAll(resp.Body)
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("cannot get token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("cannot get token: %s", tokenBytes)
+	}
+
+	// save token in config
+	token := string(tokenBytes)
+	ldc.cfg.Token = token
+	ldc.expiryTime = time.Now().AddDate(0, 0, 1)
+
+	return nil
+}
+
+// do method performs request and returns response as an array of bytes and nil error in case of response status code 200.
+// In any other cases do returns nil response and error.
+// Retries are implemented in case of connection reset errors.
+func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) ([]byte, error) {
+	// set up request headers and body
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	if ctype != "" {
+		req.Header.Set("Content-Type", ctype)
+	}
+
+	req.Header.Set("Accept", "application/json")
+
+	buf, err := io.ReadAll(req.Body)
 	if err != nil {
 		return nil, err
 	}
 
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := ldc.client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
 	}
 
-	return respBytes, nil
+	// retries logic GOES HERE
+	// get http response
+	//var resp *http.Response
+	//for i := uint64(0); i < ldc.cfg.Retries; i++ {
+	//	req := req.Clone(req.Context())
+	//	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	//
+	//	if i > 0 {
+	//		time.Sleep(5 * time.Second) // no time sleep for the first request
+	//	}
+	//
+	//	resp, err = ldc.client.Do(req)
+	//
+	//	// stop retries on success and close response body
+	//	if resp != nil {
+	//		defer resp.Body.Close()
+	//	}
+	//	if err == nil {
+	//		break
+	//	}
+	//
+	//	// retries in case of connection errors with time sleep
+	//	if isConnectionError(err) {
+	//		continue
+	//	}
+	//
+	//	// return error in case of non-connection error
+	//	return nil, err
+	//}
+
+	// handle http request errors
+	if err != nil {
+		return nil, err
+	}
+	if resp == nil {
+		return nil, fmt.Errorf("got empty response without error")
+	}
+
+	// handle successful request
+	respBytes, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with status code other than 200
+	err = fmt.Errorf("%s", respBytes)
+	return nil, fmt.Errorf("could not execute request: %w", err)
+}
+
+func trimLegacyConfig(cfg *config.LegacyConfig) config.LegacyConfig {
+	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
+	return *cfg
 }

pkg/cloudapi/account/add_user.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for adding permission to access to account for a user
+// AddUserRequest struct to add permission to access account for a user
 type AddUserRequest struct {
 	// ID of account to add to
 	// Required: true
@@ -30,9 +30,7 @@ type AddUserRequest struct {
 func (a Account) AddUser(ctx context.Context, req AddUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/addUser"

pkg/cloudapi/account/audits.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for give list account audits
+// AuditsRequest struct to give list of account audits
 type AuditsRequest struct {
 	// ID of the account
 	// Required: true
@@ -19,9 +19,7 @@ type AuditsRequest struct {
 func (a Account) Audits(ctx context.Context, req AuditsRequest) (ListAudits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/audits"

pkg/cloudapi/account/create.go

@@ -1,77 +0,0 @@
-package account
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for creating account
-type CreateRequest struct {
-	// Display name
-	// Required: true
-	Name string `url:"name" json:"name" validate:"required"`
-
-	// Name of the account
-	// Required: true
-	Username string `url:"username" json:"username" validate:"required"`
-
-	// Email
-	// Required: false
-	EmailAddress string `url:"emailaddress,omitempty" json:"emailaddress,omitempty" validate:"omitempty,email"`
-
-	// Max size of memory in MB
-	// Required: false
-	MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
-
-	// Max size of aggregated vdisks in GB
-	// Required: false
-	MaxVDiskCapacity int64 `url:"maxVDiskCapacity,omitempty" json:"maxVDiskCapacity,omitempty"`
-
-	// Max number of CPU cores
-	// Required: false
-	MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
-
-	// Max sent/received network transfer peering
-	// Required: false
-	MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
-
-	// Max number of assigned public IPs
-	// Required: false
-	MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`
-
-	// If true send emails when a user is granted access to resources
-	// Required: false
-	SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"`
-
-	// Limit (positive) or disable (0) GPU resources
-	// Required: false
-	GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
-}
-
-// Create creates account
-// Setting a cloud unit maximum to -1 or empty will not put any restrictions on the resource
-func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/account/create"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return 0, err
-	}
-
-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/account/delete.go

@@ -7,7 +7,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for delete account
+// DeleteRequest struct to delete account
 type DeleteRequest struct {
 	// ID of account to delete
 	// Required: true
@@ -19,20 +19,18 @@ type DeleteRequest struct {
 }
 
 // Delete completes delete an account from the system Returns true if account is deleted or was already deleted or never existed
-func (a Account) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
+func (a Account) Delete(ctx context.Context, req DeleteRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/delete"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(result), nil
 }

pkg/cloudapi/account/delete_user.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for revoke access to account
+// DeleteUserRequest struct to revoke access to account
 type DeleteUserRequest struct {
 	// ID of the account
 	// Required: true
@@ -17,19 +17,13 @@ type DeleteUserRequest struct {
 	// ID or emailaddress of the user to remove
 	// Required: true
 	UserID string `url:"userId" json:"userId" validate:"required"`
-
-	// Recursively revoke access rights from owned cloudspaces and vmachines
-	// Required: false
-	RecursiveDelete bool `url:"recursivedelete,omitempty" json:"recursivedelete,omitempty"`
 }
 
 // DeleteUser revokes user access from the account
 func (a Account) DeleteUser(ctx context.Context, req DeleteUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/deleteUser"

pkg/cloudapi/account/disable_enable.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for change status of account
+// DisableEnableRequest struct to change status of account
 type DisableEnableRequest struct {
 	// ID of account
 	// Required: true
@@ -19,9 +19,7 @@ type DisableEnableRequest struct {
 func (a Account) Disable(ctx context.Context, req DisableEnableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/disable"
@@ -43,9 +41,7 @@ func (a Account) Disable(ctx context.Context, req DisableEnableRequest) (bool, e
 func (a Account) Enable(ctx context.Context, req DisableEnableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/enable"

pkg/cloudapi/account/filter_test.go

@@ -7,7 +7,7 @@ import (
 var accounts = ListAccounts{
 	Data: []ItemAccount{
 		{
-			ACL: []RecordACL{
+			ACL: []ListRecordACL{
 				{
 					IsExplicit: true,
 					GUID:       "",
@@ -25,7 +25,7 @@ var accounts = ListAccounts{
 			UpdatedTime: 1676645275,
 		},
 		{
-			ACL: []RecordACL{
+			ACL: []ListRecordACL{
 				{
 					IsExplicit: true,
 					GUID:       "",
@@ -43,7 +43,7 @@ var accounts = ListAccounts{
 			UpdatedTime: 1676645275,
 		},
 		{
-			ACL: []RecordACL{
+			ACL: []ListRecordACL{
 				{
 					IsExplicit: true,
 					GUID:       "",

pkg/cloudapi/account/get.go

@@ -8,25 +8,16 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get information about account
+// GetRequest struct to get information about account
 type GetRequest struct {
 	// ID an account
 	// Required: true
-    AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 }
 
-// Get gets account details
+// Get gets account details as a RecordAccount struct
 func (a Account) Get(ctx context.Context, req GetRequest) (*RecordAccount, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/account/get"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.GetRaw(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -41,3 +32,16 @@ func (a Account) Get(ctx context.Context, req GetRequest) (*RecordAccount, error
 	return &info, nil
 
 }
+
+// GetRaw gets account details as an array of bytes
+func (a Account) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/get"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/account/get_consumed_account_units.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for calculate the currently consumed units for all cloudspaces and resource groups in the account
+// GetConsumedAccountUnitsRequest struct to calculate the currently consumed units for all cloudspaces and resource groups in the account
 type GetConsumedAccountUnitsRequest struct {
 	// ID an account
 	// Required: true
@@ -25,9 +25,7 @@ type GetConsumedAccountUnitsRequest struct {
 func (a Account) GetConsumedAccountUnits(ctx context.Context, req GetConsumedAccountUnitsRequest) (*ResourceLimits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/getConsumedAccountUnits"

pkg/cloudapi/account/get_consumed_cloud_units_by_type.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for calculate the currently consumed cloud units of the specified type for all cloudspaces and resource groups in the account
+// GetConsumedCloudUnitsByTypeRequest struct to calculate the currently consumed cloud units of the specified type for all cloudspaces and resource groups in the account
 type GetConsumedCloudUnitsByTypeRequest struct {
 	// ID an account
 	// Required: true
@@ -35,9 +35,7 @@ type GetConsumedCloudUnitsByTypeRequest struct {
 func (a Account) GetConsumedCloudUnitsByType(ctx context.Context, req GetConsumedCloudUnitsByTypeRequest) (float64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
-		}
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/getConsumedCloudUnitsByType"

pkg/cloudapi/account/get_consumption.go

@@ -1,62 +0,0 @@
-package account
-
-import (
-	"context"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for download the resources tracking files for an account
-type GetConsumptionRequest struct {
-	// ID an account
-	// Required: true
-	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
-
-	// Epoch represents the start time
-	// Required: true
-	Start uint64 `url:"start" json:"start" validate:"required"`
-
-	// Epoch represents the end time
-	// Required: true
-	End uint64 `url:"end" json:"end" validate:"required"`
-}
-
-// GetConsumption downloads the resources tracking files for an account within a given period
-func (a Account) GetConsumption(ctx context.Context, req GetConsumptionRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return "", validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/account/getConsumption"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-
-}
-
-// GetConsumptionGet downloads the resources tracking files for an account within a given period
-func (a Account) GetConsumptionGet(ctx context.Context, req GetConsumptionRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return "", validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/account/getConsumption"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodGet, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/account/get_reserved_account_units.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for calculate the reserved units for all cloudspaces and resource groups in the account
+// GetReservedAccountUnitsRequest struct to calculate the reserved units for all cloudspaces and resource groups in the account
 type GetReservedAccountUnitsRequest struct {
 	// ID an account
 	// Required: true
@@ -26,9 +26,7 @@ type GetReservedAccountUnitsRequest struct {
 func (a Account) GetReservedAccountUnits(ctx context.Context, req GetReservedAccountUnitsRequest) (*ResourceLimits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/getReservedAccountUnits"

pkg/cloudapi/account/get_resource_consumption.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for getting resource consumption
+// GetResourceConsumptionRequest struct to get resource consumption
 type GetResourceConsumptionRequest struct {
 	// ID an account
 	// Required: true
@@ -19,9 +19,7 @@ type GetResourceConsumptionRequest struct {
 func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*RecordResourceConsumption, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/getResourceConsumption"

pkg/cloudapi/account/ids.go

@@ -0,0 +1,73 @@
+package account
+
+// IDs gets array of AccountIDs from ListAccounts struct
+func (la ListAccounts) IDs() []uint64 {
+	res := make([]uint64, 0, len(la.Data))
+	for _, acc := range la.Data {
+		res = append(res, acc.ID)
+	}
+	return res
+}
+
+// IDs gets array of ComputeIDs from ListComputes struct
+func (lc ListComputes) IDs() []uint64 {
+	res := make([]uint64, 0, len(lc.Data))
+	for _, c := range lc.Data {
+		res = append(res, c.ComputeID)
+	}
+	return res
+}
+
+// IDs gets array of DiskIDs from ListDisks struct
+func (ld ListDisks) IDs() []uint64 {
+	res := make([]uint64, 0, len(ld.Data))
+	for _, d := range ld.Data {
+		res = append(res, d.ID)
+	}
+	return res
+}
+
+// IDs gets array of FLIPGroupIDs from ListFLIPGroups struct
+func (fg ListFLIPGroups) IDs() []uint64 {
+	res := make([]uint64, 0, len(fg.Data))
+	for _, g := range fg.Data {
+		res = append(res, g.ID)
+	}
+	return res
+}
+
+// IDs gets array of AccountIDs from ListResourceConsumption struct
+func (rc ListResourceConsumption) IDs() []uint64 {
+	res := make([]uint64, 0, len(rc.Data))
+	for _, r := range rc.Data {
+		res = append(res, r.AccountID)
+	}
+	return res
+}
+
+// IDs gets array of RGIDs from ListRG struct
+func (rg ListRG) IDs() []uint64 {
+	res := make([]uint64, 0, len(rg.Data))
+	for _, g := range rg.Data {
+		res = append(res, g.RGID)
+	}
+	return res
+}
+
+// IDs gets array of TemplateIDs from ListTemplates struct
+func (lt ListTemplates) IDs() []uint64 {
+	res := make([]uint64, 0, len(lt.Data))
+	for _, t := range lt.Data {
+		res = append(res, t.ID)
+	}
+	return res
+}
+
+// IDs gets array of VINSIDs from ListVINS struct
+func (lv ListVINS) IDs() []uint64 {
+	res := make([]uint64, 0, len(lv.Data))
+	for _, v := range lv.Data {
+		res = append(res, v.ID)
+	}
+	return res
+}

pkg/cloudapi/account/list.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list of accounts
+// ListRequest struct to get list of accounts
 type ListRequest struct {
 	// Find by ID
 	// Required: false
@@ -24,6 +26,15 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
+	// Sort by zone id
+	// Default value: 0
+	// Required: false
+	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -33,11 +44,10 @@ type ListRequest struct {
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
-// List gets list all accounts the user has access to
+// List gets a list of all accounts the user has access to a ListAccounts struct
 func (a Account) List(ctx context.Context, req ListRequest) (*ListAccounts, error) {
-	url := "/cloudapi/account/list"
 
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -51,3 +61,16 @@ func (a Account) List(ctx context.Context, req ListRequest) (*ListAccounts, erro
 
 	return &list, nil
 }
+
+// ListRaw gets a list of all accounts the user has access to as an array of bytes
+func (a Account) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/list"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/account/list_computes.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for a get list compute instances
+// ListComputesRequest struct to get a list of compute instances
 type ListComputesRequest struct {
 	// ID an account
 	// Required: true
@@ -46,6 +46,10 @@ type ListComputesRequest struct {
 	// Required: false
 	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -57,11 +61,10 @@ type ListComputesRequest struct {
 
 // ListComputes gets list all compute instances under specified account, accessible by the user
 func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (*ListComputes, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/listComputes"

pkg/cloudapi/account/list_deleted.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list deleted accounts
+// ListDeletedRequest struct to get a list of deleted accounts
 type ListDeletedRequest struct {
 	// Page number
 	// Required: false
@@ -27,10 +29,20 @@ type ListDeletedRequest struct {
 	// Find by access control list
 	// Required: false
 	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 }
 
-// ListDeleted gets list all deleted accounts the user has access to
+// ListDeleted gets list of all deleted accounts the user has access to
 func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListAccounts, error) {
+
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/account/listDeleted"
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/account/list_disks.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list deleted disks
+// ListDisksRequest struct to get a list of deleted disks
 type ListDisksRequest struct {
 	// ID an account
 	// Required: true
@@ -30,6 +30,10 @@ type ListDisksRequest struct {
 	// Required: false
 	Type string `url:"type,omitempty" json:"type,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,11 +45,10 @@ type ListDisksRequest struct {
 
 // ListDisks gets list all currently unattached disks under specified account
 func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (*ListDisks, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/listDisks"

pkg/cloudapi/account/list_flipgroups.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list FLIPGroups
+// ListFLIPGroupsRequest struct to get a list of FLIPGroups
 type ListFLIPGroupsRequest struct {
 	// ID of the account
 	// Required: true
@@ -38,6 +38,10 @@ type ListFLIPGroupsRequest struct {
 	// Required: false
 	FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -49,11 +53,10 @@ type ListFLIPGroupsRequest struct {
 
 // ListFLIPGroups gets list all FLIPGroups under specified account, accessible by the user
 func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (*ListFLIPGroups, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/listFlipGroups"

pkg/cloudapi/account/list_rg.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list resource groups
+// ListRGRequest struct to get a list of resource groups
 type ListRGRequest struct {
 	// ID an account
 	// Required: true
@@ -41,15 +41,18 @@ type ListRGRequest struct {
 	// Find by status
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 }
 
-// ListRG gets list all resource groups under specified account, accessible by the user
+// ListRG gets list of all resource groups under specified account, accessible by the user
 func (a Account) ListRG(ctx context.Context, req ListRGRequest) (*ListRG, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/listRG"

pkg/cloudapi/account/list_templates.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list templates
+// ListTemplatesRequest struct to get a list of templates
 type ListTemplatesRequest struct {
 	// ID an account
 	// Required: true
@@ -30,6 +30,10 @@ type ListTemplatesRequest struct {
 	// Required: false
 	Type string `url:"type,omitempty" json:"type,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -39,13 +43,12 @@ type ListTemplatesRequest struct {
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
-// ListTemplates gets list templates which can be managed by this account
+// ListTemplates gets list of templates which can be managed by this account
 func (a Account) ListTemplates(ctx context.Context, req ListTemplatesRequest) (*ListTemplates, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/listTemplates"

pkg/cloudapi/account/list_vins.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list VINS
+// ListVINSRequest struct to get a list of VINS
 type ListVINSRequest struct {
 	// ID an account
 	// Required: true
@@ -30,6 +30,10 @@ type ListVINSRequest struct {
 	// Required: false
 	ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -39,13 +43,12 @@ type ListVINSRequest struct {
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
-// ListVINS gets list all ViNSes under specified account, accessible by the user
+// ListVINS gets list of all ViNSes under specified account, accessible by the user
 func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (*ListVINS, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/listVins"

pkg/cloudapi/account/models.go

@@ -1,7 +1,34 @@
 package account
 
+// Access Control List
+type ListRecordACL struct {
+	// Whether access is explicitly specified
+	IsExplicit bool `json:"explicit"`
+
+	// GUID
+	GUID string `json:"guid"`
+
+	// Access rights
+	Rights string `json:"right"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Account Type
+	Type string `json:"type"`
+
+	// Account owner ID
+	UgroupID string `json:"userGroupId"`
+
+	// Is it possible to remove
+	CanBeDeleted bool `json:"canBeDeleted"`
+}
+
 // Access Control List
 type RecordACL struct {
+	// Emails
+	Emails []string `json:"emails"`
+
 	// Whether access is explicitly specified
 	IsExplicit bool `json:"explicit"`
 
@@ -46,12 +73,24 @@ type ResourceLimits struct {
 
 	// Number of graphics cores
 	GPUUnits float64 `json:"gpu_units"`
+
+	// Storage policy
+	StoragePolicy []StoragePolicyItem `json:"storage_policy"`
+}
+
+type StoragePolicyItem struct {
+	ID uint64 `json:"id"`
+
+	Limit int `json:"limit"`
 }
 
 // Main information in one of if the list of accounts
 type ItemAccount struct {
 	// Access Control List
-	ACL []RecordACL `json:"acl"`
+	ACL []ListRecordACL `json:"acl"`
+
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
 
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
@@ -59,6 +98,9 @@ type ItemAccount struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -70,6 +112,9 @@ type ItemAccount struct {
 
 	// Updated time
 	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Zones
+	ZoneIDs []uint64 `json:"zoneIds"`
 }
 
 // List of accounts
@@ -79,6 +124,18 @@ type ListAccounts struct {
 	EntryCount uint64 `json:"entryCount"`
 }
 
+// Policy
+type Policy struct {
+	// Size of the disk
+	DiskSize float64 `json:"disksize"`
+
+	// Max size of the disk
+	DiskSizeMax float64 `json:"disksizemax"`
+
+	// SEPs used
+	SEPs map[string]map[string]DiskUsage `json:"seps"`
+}
+
 // Resources used
 type Resource struct {
 	// Number of cores
@@ -88,7 +145,7 @@ type Resource struct {
 	DiskSize float64 `json:"disksize"`
 
 	// Max disk size
-	DiskSizeMax uint64 `json:"disksizemax"`
+	DiskSizeMax float64 `json:"disksizemax"`
 
 	// Number of External IPs
 	ExtIPs int64 `json:"extips"`
@@ -99,6 +156,9 @@ type Resource struct {
 	// Number of grafic cores
 	GPU int64 `json:"gpu"`
 
+	// Policies
+	Policies map[string]Policy `json:"policies"`
+
 	// Number of RAM
 	RAM int64 `json:"ram"`
 
@@ -126,10 +186,10 @@ type RecordResourceConsumption struct {
 // Information about resources
 type ItemResourceConsumption struct {
 	// Current information about resources
-	Current Resource `json:"Current"`
+	Consumed Resource `json:"consumed"`
 
 	// Reserved information about resources
-	Reserved Resource `json:"Reserved"`
+	Reserved Resource `json:"reserved"`
 
 	// Account ID
 	AccountID uint64 `json:"id"`
@@ -159,14 +219,20 @@ type Machines struct {
 	Halted uint64 `json:"halted"`
 }
 
+// Detailed information about the account zone
+type ZoneID struct {
+	// ID of zone
+	ID int64 `json:"id"`
+
+	// Name of zone
+	Name string `json:"name"`
+}
+
 // Main information about account
 type RecordAccount struct {
 	// DCLocation
 	DCLocation string `json:"DCLocation"`
 
-	// CKey
-	CKey string `json:"_ckey"`
-
 	// Access control list
 	ACL []RecordACL `json:"acl"`
 
@@ -176,6 +242,9 @@ type RecordAccount struct {
 	// Company URL
 	CompanyURL string `json:"companyurl"`
 
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
+
 	// Computes
 	Computes Computes `json:"computes"`
 
@@ -191,6 +260,9 @@ type RecordAccount struct {
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Deactivation time
 	DeactivationTime float64 `json:"deactivationTime"`
 
@@ -227,6 +299,9 @@ type RecordAccount struct {
 	// Status
 	Status string `json:"status"`
 
+	// Storage policy ids
+	StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
+
 	// UniqPools
 	UniqPools []interface{} `json:"uniqPools"`
 
@@ -241,6 +316,12 @@ type RecordAccount struct {
 
 	// VINSes
 	VINSes uint64 `json:"vinses"`
+
+	// Zone
+	ZoneIDs []ZoneID `json:"zoneIds"`
+
+	// Zones
+	DefaultZoneID uint64 `json:"defaultZoneId"`
 }
 
 // Main information about compute
@@ -374,6 +455,12 @@ type ItemVINS struct {
 	// External IP
 	ExternalIP string `json:"externalIP"`
 
+	// Extnet ID
+	ExtnetId uint64 `json:"extnetId"`
+
+	// Free IPs
+	FreeIPs int64 `json:"freeIPs"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -500,6 +587,9 @@ type ItemRG struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Resource group ID
 	RGID uint64 `json:"id"`
 

pkg/cloudapi/account/restore.go

@@ -3,10 +3,11 @@ package account
 import (
 	"context"
 	"net/http"
+
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for restore a deleted account
+// RestoreRequest struct to restore a deleted account
 type RestoreRequest struct {
 	// ID an account
 	// Required: true
@@ -14,20 +15,18 @@ type RestoreRequest struct {
 }
 
 // Restore restores a deleted account
-func (a Account) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
+func (a Account) Restore(ctx context.Context, req RestoreRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/restore"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(result), nil
 }

pkg/cloudapi/account/update.go

@@ -8,12 +8,16 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for updaate account
+// UpdateRequest struct to update account
 type UpdateRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
+	// Description
+	// Required: false
+	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
 	// Name of the account
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
@@ -45,15 +49,22 @@ type UpdateRequest struct {
 	// Limit (positive) or disable (0) GPU resources
 	// Required: false
 	GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
+
+	// List of strings with pools
+	// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
+	// Required: false
+	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
+
+	// Default zone ID
+	// Required: false
+	DefaultZoneID uint64 `url:"defaultZoneId,omitempty" json:"defaultZoneId,omitempty"`
 }
 
 // Update updates an account name and resource types and limits
 func (a Account) Update(ctx context.Context, req UpdateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/update"

pkg/cloudapi/account/update_user.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for update user access rights
+// UpdateUserRequest struct to update user access rights
 type UpdateUserRequest struct {
 	// ID of the account
 	// Required: true
@@ -30,9 +30,7 @@ type UpdateUserRequest struct {
 func (a Account) UpdateUser(ctx context.Context, req UpdateUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/updateUser"

pkg/cloudapi/audit.go

@@ -0,0 +1,10 @@
+package cloudapi
+
+import (
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/audit"
+)
+
+// Accessing the Stack method group
+func (ca *CloudAPI) Audit() *audit.Audit {
+	return audit.New(ca.client)
+}

pkg/cloudapi/audit/audit.go

@@ -0,0 +1,15 @@
+package audit
+
+import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+
+// Structure for creating request to audit
+type Audit struct {
+	client interfaces.Caller
+}
+
+// Builder for audit endpoint
+func New(client interfaces.Caller) *Audit{
+	return &Audit{
+		client: client,
+	}
+}

pkg/cloudapi/audit/filter.go

@@ -0,0 +1,81 @@
+package audit
+
+// FilterByID returns ListAudits with specified ID.
+func (la ListAudits) FilterByID(guid string) ListAudits {
+	predicate := func(ia ItemAudit) bool {
+		return ia.GUID == guid
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByCall returns ListAudits with specified call.
+func (la ListAudits) FilterByCall(call string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.Call == call
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByCorrelationID returns ListAudits with specified correlation id.
+func (la ListAudits) FilterByCorrelationID(correlationID string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.CorrelationID == correlationID
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByRemoteAddr returns ListAudits with specified remote address.
+func (la ListAudits) FilterByRemoteAddr(remoteAddr string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.RemoteAddr == remoteAddr
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByUser returns ListAudits with specified user name.
+func (la ListAudits) FilterByUser(user string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.User == user
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByStatusCode return ListAudits with specified status code.
+func (la ListAudits) FilterByStatusCode(statusCode uint64) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.StatusCode == statusCode
+	}
+
+	return la.FilterFunc(predicate)
+
+}
+
+// FilterFunc allows filtering ListAudits based on a user-specified predicate.
+func (la ListAudits) FilterFunc(predicate func(ItemAudit) bool) ListAudits {
+	var result ListAudits
+
+	for _, item := range la.Data {
+		if predicate(item) {
+			result.Data = append(result.Data, item)
+		}
+	}
+
+	result.EntryCount = uint64(len(result.Data))
+
+	return result
+}
+
+// FindOne returns first found ItemAudit
+// If none was found, returns an empty struct.
+func (la ListAudits) FindOne() ItemAudit {
+	if len(la.Data) == 0 {
+		return ItemAudit{}
+	}
+
+	return la.Data[0]
+}

pkg/cloudapi/audit/filter_test.go

@@ -0,0 +1,115 @@
+package audit
+
+import (
+	"testing"
+)
+
+var audits = ListAudits{
+	Data: []ItemAudit{
+		{
+			Args:          "[]",
+			Call:          "/restmachine/cloudapi/audit/linkedJobs",
+			GUID:          "550e8400-e29b-41d4-a716-446655440001",
+			CorrelationID: "550e8400-e29b-41d4-a716-446655440001",
+			Kwargs:        `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
+			RemoteAddr:    "192.168.1.100",
+			ResponseTime:  1,
+			Result:        `[]`,
+			StatusCode:    200,
+			Timestamp:     1640995200,
+			TimestampEnd:  1640995201,
+			User:          "test@example.com",
+			TTL:           "2025-07-31T14:22:57.028000",
+		},
+		{
+			Args:          "[]",
+			Call:          "/restmachine/cloudapi/audit/test",
+			GUID:          "550e8400-e29b-41d4-a716-446655440002",
+			CorrelationID: "550e8400-e29b-41d4-a716-446655440002",
+			Kwargs:        `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
+			RemoteAddr:    "192.168.1.105",
+			ResponseTime:  5,
+			Result:        `[]`,
+			StatusCode:    400,
+			Timestamp:     1640995200,
+			TimestampEnd:  1640995201,
+			User:          "test2@example.com",
+			TTL:           "2025-07-31T14:22:57.028000",
+		},
+	},
+	EntryCount: 2,
+}
+
+func TestFilterByID(t *testing.T) {
+	actual := audits.FilterByID("550e8400-e29b-41d4-a716-446655440002").FindOne()
+
+	if actual.GUID != "550e8400-e29b-41d4-a716-446655440002" {
+		t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.GUID)
+	}
+
+	actualEmpty := audits.FilterByID("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByCorrelationID(t *testing.T) {
+	actual := audits.FilterByCorrelationID("550e8400-e29b-41d4-a716-446655440002").FindOne()
+
+	if actual.CorrelationID != "550e8400-e29b-41d4-a716-446655440002" {
+		t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.CorrelationID)
+	}
+
+	actualEmpty := audits.FilterByCorrelationID("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByRemoteAddr(t *testing.T) {
+	actual := audits.FilterByRemoteAddr("192.168.1.100").FindOne()
+
+	if actual.RemoteAddr != "192.168.1.100" {
+		t.Fatal("expected remote address 192.168.1.100, found: ", actual.RemoteAddr)
+	}
+
+	actualEmpty := audits.FilterByRemoteAddr("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByUser(t *testing.T) {
+	actual := audits.FilterByUser("test@example.com").FindOne()
+
+	if actual.User != "test@example.com" {
+		t.Fatal("expected user test@example.com, found: ", actual.RemoteAddr)
+	}
+
+	actualEmpty := audits.FilterByUser("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByCall(t *testing.T) {
+	actual := audits.FilterByCall("/restmachine/cloudapi/audit/test").FindOne()
+
+	if actual.Call != "/restmachine/cloudapi/audit/test" {
+		t.Fatal("expected call /restmachine/cloudapi/audit/test, found: ", actual.Call)
+	}
+}
+
+func TestFilterByStatusCode(t *testing.T) {
+	actual := audits.FilterByStatusCode(200)
+
+	for _, item := range actual.Data {
+		if item.StatusCode != 200 {
+			t.Fatal("expected 200 status code, found: ", item.StatusCode)
+		}
+	}
+}

pkg/cloudapi/audit/get.go

@@ -0,0 +1,46 @@
+package audit
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetRequest struct to get information about account
+type GetRequest struct {
+	// Audit GUID
+	// Required: true
+	AuditGuid string `url:"audit_guid" json:"audit_guid" validate:"required"`
+}
+
+// Get gets information about audit as a RecordAudit struct
+func (a Audit) Get(ctx context.Context, req GetRequest) (*RecordAudit, error) {
+	res, err := a.GetRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := RecordAudit{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about audit as an array of bytes
+func (a Audit) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/audit/get"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/audit/list.go

@@ -0,0 +1,124 @@
+package audit
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ListRequest struct to give list of account audits
+type ListRequest struct {
+
+	// Find all audits after point in time (unixtime)
+	// Required: false
+	TimestampAt uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
+
+	// Find all audits before point in time (unixtime)
+	// Required: false
+	TimestampTo uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
+
+	// Find by user (Mongo RegExp supported)
+	// Required: false
+	User string `url:"user,omitempty" json:"user,omitempty"`
+
+	// Find by api endpoint (Mongo RegExp supported)
+	// Required: false
+	Call string `url:"call,omitempty" json:"call,omitempty"`
+
+	// Find by request id
+	// Required: false
+	RequestID string `url:"request_id,omitempty" json:"request_id,omitempty"`
+
+	// Find by HTTP min status code
+	// Required: false
+	MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
+
+	// Find by HTTP max status code
+	// Required: false
+	MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty" validate:"omitempty,sortBy"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"resgroup_id,omitempty" json:"resgroup_id,omitempty"`
+
+	// Find by compute id
+	// Required: false
+	ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
+
+	// Find by account id
+	// Required: false
+	AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
+
+	// Find by vins id
+	// Required: false
+	VINSID uint64 `url:"vins_id,omitempty" json:"vins_id,omitempty"`
+
+	// Find by service id
+	// Required: false
+	ServiceID uint64 `url:"service_id,omitempty" json:"service_id,omitempty"`
+
+	// Find by k8s id
+	// Required: false
+	K8SID uint64 `url:"k8s_id,omitempty" json:"k8s_id,omitempty"`
+
+	// Find by flipgroup id
+	// Required: false
+	FLIPGroupID uint64 `url:"flipgroup_id,omitempty" json:"flipgroup_id,omitempty"`
+
+	// Find by load balancer id
+	// Required: false
+	LBID uint64 `url:"lb_id,omitempty" json:"lb_id,omitempty"`
+
+	// Find by sep id
+	// Required: false
+	SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
+
+	// Exclude audit lines from response
+	// Required: false
+	ExcludeAuditLines bool `url:"exclude_audit_lines,omitempty" json:"exclude_audit_lines,omitempty"`
+}
+
+// List gets audit records for the specified account object
+func (a Audit) List(ctx context.Context, req ListRequest) (*ListAudits, error) {
+
+	res, err := a.ListRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListAudits{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}
+
+// ListRaw gets list of audit records an array of bytes
+func (a Audit) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/audit/list"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/audit/models.go

@@ -0,0 +1,95 @@
+package audit
+
+// Main info about audit
+type RecordAudit struct {
+
+	// Arguments
+	Arguments string `json:"args"`
+
+	// Call
+	Call string `json:"call"`
+
+	// GUID
+	GUID string `json:"guid"`
+
+	// Correlation ID
+	CorrelationID string `json:"correlation_id"`
+
+	// Kwargs
+	Kwargs string `json:"kwargs"`
+
+	// RemoteAddr
+	RemoteAddr string `json:"remote_addr"`
+
+	// Response time
+	ResponseTime float64 `json:"responsetime"`
+
+	// Result
+	Result string `json:"result"`
+
+	// Status code
+	StatusCode uint64 `json:"statuscode"`
+
+	// Tags
+	Tags string `json:"tags"`
+
+	// Timestamp
+	Timestamp float64 `json:"timestamp"`
+
+	// TimestampEnd
+	TimestampEnd float64 `json:"timestampEnd"`
+
+	// User
+	User string `json:"user"`
+}
+
+// Main info about audit
+type ItemAudit struct {
+	// Args
+	Args string `json:"args"`
+
+	// Call
+	Call string `json:"call"`
+
+	// GUID
+	GUID string `json:"guid"`
+
+	// Correlation ID
+	CorrelationID string `json:"correlation_id"`
+
+	// Kwargs
+	Kwargs string `json:"kwargs"`
+
+	// RemoteAddr
+	RemoteAddr string `json:"remote_addr"`
+
+	// Response time
+	ResponseTime float64 `json:"responsetime"`
+
+	// Result
+	Result string `json:"result"`
+
+	// Status code
+	StatusCode uint64 `json:"statuscode"`
+
+	// Timestamp
+	Timestamp float64 `json:"timestamp"`
+
+	// Timestamp End
+	TimestampEnd float64 `json:"timestampEnd"`
+
+	// User
+	User string `json:"user"`
+
+	// TTL
+	TTL string `json:"_ttl"`
+}
+
+// List of audits
+type ListAudits struct {
+	// Data
+	Data []ItemAudit `json:"data"`
+
+	// EntryCount
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/bservice/create.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for BasicService
+// CreateRequest struct for BasicService
 type CreateRequest struct {
 	// Name of the service
 	// Required: true
@@ -25,15 +25,17 @@ type CreateRequest struct {
 	// SSH key to deploy for the specified user. Same key will be deployed to all computes of the service
 	// Required: false
 	SSHKey string `url:"sshKey,omitempty" json:"sshKey,omitempty"`
+
+	// Zone ID
+	// Required: false
+	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
 }
 
 // Create creates blank BasicService instance
 func (b BService) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
-		}
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/create"

pkg/cloudapi/bservice/delete.go

@@ -8,14 +8,15 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for delete basic service
+// DeleteRequest struct to delete basic service
 type DeleteRequest struct {
 	// ID of the BasicService to be delete
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// If set to False, Basic service will be deleted to recycle bin. Otherwise destroyed immediately
 	// Required: false
+	// Default: false
 	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
 }
 
@@ -23,9 +24,7 @@ type DeleteRequest struct {
 func (b BService) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/delete"

pkg/cloudapi/bservice/disable.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for disable service
+// DisableRequest struct for disable service
 type DisableRequest struct {
 	// ID of the service to disable
 	// Required: true
@@ -21,12 +21,10 @@ type DisableRequest struct {
 func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudapi/bservice/delete"
+	url := "/cloudapi/bservice/disable"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/bservice/enable.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for disable service
+// EnableRequest struct to disable service
 type EnableRequest struct {
 	// ID of the service to enable
 	// Required: true
@@ -22,9 +22,7 @@ type EnableRequest struct {
 func (b BService) Enable(ctx context.Context, req EnableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/enable"

pkg/cloudapi/bservice/get.go

@@ -8,35 +8,39 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get detailed information about service
+// GetRequest struct to get detailed information about service
 type GetRequest struct {
 	// ID of the service to query information
 	// Required: true
 	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 }
 
-// Get gets detailed specifications for the BasicService.
+// Get gets detailed specifications for the BasicService as a RecordBasicService struct
 func (b BService) Get(ctx context.Context, req GetRequest) (*RecordBasicService, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/bservice/get"
-
-	bsRaw, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := b.GetRaw(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
 	info := RecordBasicService{}
 
-	err = json.Unmarshal(bsRaw, &info)
+	err = json.Unmarshal(res, &info)
 	if err != nil {
 		return nil, err
 	}
 
 	return &info, nil
 }
+
+// GetRaw gets detailed specifications for the BasicService as an array of bytes
+func (b BService) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/bservice/get"
+
+	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/bservice/group_add.go

@@ -8,42 +8,39 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for create new compute group within BasicService
+// GroupAddRequest struct to create new compute group within BasicService
 type GroupAddRequest struct {
 	// ID of the Basic Service to add a group to
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// Name of the Compute Group to add
 	// Required: true
-    Name string `url:"name" json:"name" validate:"required"`
+	Name string `url:"name" json:"name" validate:"required"`
 
 	// Computes number. Defines how many computes must be there in the group
 	// Required: true
-    Count uint64 `url:"count" json:"count" validate:"required"`
+	Count uint64 `url:"count" json:"count" validate:"required"`
 
 	// Compute CPU number. All computes in the group have the same CPU count
 	// Required: true
-    CPU uint64 `url:"cpu" json:"cpu" validate:"required"`
+	CPU uint64 `url:"cpu" json:"cpu" validate:"required"`
 
 	// Compute RAM volume in MB. All computes in the group have the same RAM volume
 	// Required: true
-    RAM uint64 `url:"ram" json:"ram" validate:"required"`
+	RAM uint64 `url:"ram" json:"ram" validate:"required"`
 
 	// Compute boot disk size in GB
 	// Required: true
-    Disk uint64 `url:"disk" json:"disk" validate:"required"`
+	Disk uint64 `url:"disk" json:"disk" validate:"required"`
 
 	// OS image ID to create computes from
 	// Required: true
-    ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
+	ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
 
-	// Compute driver
-	// should be one of:
-	//	- KVM_X86
-	//	- KVM_PPC
+	// Compute driver like a KVM_X86, etc.
 	// Required: true
-    Driver string `url:"driver" json:"driver" validate:"driver"`
+	Driver string `url:"driver" json:"driver" validate:"required"`
 
 	// Storage endpoint provider ID
 	// Required: false
@@ -68,6 +65,28 @@ type GroupAddRequest struct {
 	// Time of Compute Group readiness
 	// Required: false
 	TimeoutStart uint64 `url:"timeoutStart,omitempty" json:"timeoutStart,omitempty"`
+
+	// Meta data for working group computes, format YAML "user_data": 1111
+	// Required: false
+	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
+
+	//Chipset "i440fx" or "Q35
+	//Required: false
+	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
+
+	// ID of the chosen storage policy
+	// Required: false
+	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
+}
+
+// GetRAM returns RAM field values
+func (r GroupAddRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
 }
 
 // GroupAdd creates new Compute Group within BasicService.
@@ -76,9 +95,7 @@ type GroupAddRequest struct {
 func (b BService) GroupAdd(ctx context.Context, req GroupAddRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
-		}
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupAdd"

pkg/cloudapi/bservice/group_compute_remove.go

@@ -8,11 +8,11 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for remove group compute
+// GroupComputeRemoveRequest struct to remove group compute
 type GroupComputeRemoveRequest struct {
 	// ID of the Basic Service
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// ID of the Compute GROUP
 	// Required: true
@@ -27,9 +27,7 @@ type GroupComputeRemoveRequest struct {
 func (b BService) GroupComputeRemove(ctx context.Context, req GroupComputeRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupComputeRemove"

pkg/cloudapi/bservice/group_get.go

@@ -8,11 +8,11 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get detailed information about Compute Group
+// GroupGetRequest struct to get detailed information about Compute Group
 type GroupGetRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// ID of the Compute Group
 	// Required: true
@@ -23,9 +23,7 @@ type GroupGetRequest struct {
 func (b BService) GroupGet(ctx context.Context, req GroupGetRequest) (*RecordGroup, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupGet"

pkg/cloudapi/bservice/group_parent_add.go

@@ -8,12 +8,11 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for add parent Compute Group relation emove parent Compute Group
-// relation to the specified Compute Group
+// GroupParentAddRequest struct to add parent Compute Group relation to the specified Compute Group
 type GroupParentAddRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// ID of the Compute Group
 	// Required: true
@@ -28,9 +27,7 @@ type GroupParentAddRequest struct {
 func (b BService) GroupParentAdd(ctx context.Context, req GroupParentAddRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupParentAdd"

pkg/cloudapi/bservice/group_parent_remove.go

@@ -8,30 +8,28 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for remove parent Compute Group
-// relation to the specified Compute Group
+// GroupParentRemoveRequest struct to remove parent Compute Group
+// relation from the specified Compute Group
 type GroupParentRemoveRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// ID of the Compute Group
 	// Required: true
-    CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
+	CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
 
 	// ID of the parent Compute Group
 	// to remove from the current Compute Group
 	// Required: true
-    ParentID uint64 `url:"parentId" json:"parentId" validate:"required"`
+	ParentID uint64 `url:"parentId" json:"parentId" validate:"required"`
 }
 
 // GroupParentRemove removes parent Compute Group relation to the specified Compute Group
 func (b BService) GroupParentRemove(ctx context.Context, req GroupParentRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupParentRemove"

pkg/cloudapi/bservice/group_remove.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for destroy the specified Compute Group
+// GroupRemoveRequest struct for destroy the specified Compute Group
 type GroupRemoveRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -23,9 +23,7 @@ type GroupRemoveRequest struct {
 func (b BService) GroupRemove(ctx context.Context, req GroupRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupRemove"

pkg/cloudapi/bservice/group_resize.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for resize the group
+// GroupResizeRequest struct to resize the group
 type GroupResizeRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -22,6 +22,12 @@ type GroupResizeRequest struct {
 	// Required: true
 	Count int64 `url:"count" json:"count" validate:"required"`
 
+	//Chipset for new computes, either i440fx or Q35 (i440fx by default)
+	//Available values : i440fx, Q35
+	//Default value : i440fx
+	//Required: true
+	Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`
+
 	// Either delta or absolute value of computes
 	// Should be one of:
 	//	- ABSOLUTE
@@ -34,9 +40,7 @@ type GroupResizeRequest struct {
 func (b BService) GroupResize(ctx context.Context, req GroupResizeRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
-		}
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupResize"

pkg/cloudapi/bservice/group_start.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for start the specified Compute Group
+// GroupStartRequest struct to start the specified Compute Group
 type GroupStartRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -23,9 +23,7 @@ type GroupStartRequest struct {
 func (b BService) GroupStart(ctx context.Context, req GroupStartRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupStart"

pkg/cloudapi/bservice/group_stop.go

@@ -8,15 +8,15 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for stop the specified Compute Group
+// GroupStopRequest struct to stop the specified Compute Group
 type GroupStopRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// ID of the Compute Group to stop
 	// Required: true
-    CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
+	CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
 
 	// Force stop Compute Group
 	// Required: false
@@ -27,9 +27,7 @@ type GroupStopRequest struct {
 func (b BService) GroupStop(ctx context.Context, req GroupStopRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupStop"

pkg/cloudapi/bservice/group_update.go

@@ -8,15 +8,15 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for update existing Compute group
+// GroupUpdateRequest struct to update existing Compute group
 type GroupUpdateRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
-    ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
 
 	// ID of the Compute Group
 	// Required: true
-    CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
+	CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
 
 	// Specify non-empty string to update Compute Group name
 	// Required: false
@@ -43,13 +43,21 @@ type GroupUpdateRequest struct {
 	Force bool `url:"force,omitempty" json:"force,omitempty"`
 }
 
+// GetRAM returns RAM field values
+func (r GroupUpdateRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
+}
+
 // GroupUpdate updates existing Compute group within Basic Service and apply new settings to its computes as necessary
 func (b BService) GroupUpdate(ctx context.Context, req GroupUpdateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupUpdate"

pkg/cloudapi/bservice/group_update_extnet.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for update External Network settings
+// GroupUpdateExtNetRequest struct to update External Network settings
 type GroupUpdateExtNetRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -27,9 +27,7 @@ type GroupUpdateExtNetRequest struct {
 func (b BService) GroupUpdateExtNet(ctx context.Context, req GroupUpdateExtNetRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupUpdateExtnet"

pkg/cloudapi/bservice/group_update_vins.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for update VINS settings
+// GroupUpdateVINSRequest struct to update VINS settings
 type GroupUpdateVINSRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -27,9 +27,7 @@ type GroupUpdateVINSRequest struct {
 func (b BService) GroupUpdateVINS(ctx context.Context, req GroupUpdateVINSRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/groupUpdateVins"

pkg/cloudapi/bservice/ids.go

@@ -0,0 +1,37 @@
+package bservice
+
+// IDs gets array of BasicServiceIDs from ListBasicServices struct
+func (lbs ListBasicServices) IDs() []uint64 {
+	res := make([]uint64, 0, len(lbs.Data))
+	for _, bs := range lbs.Data {
+		res = append(res, bs.ID)
+	}
+	return res
+}
+
+// IDs gets array of ComputeIDs from ListComputes struct
+func (lc ListComputes) IDs() []uint64 {
+	res := make([]uint64, 0, len(lc))
+	for _, c := range lc {
+		res = append(res, c.ID)
+	}
+	return res
+}
+
+// IDs gets array of GroupIDs from ListGroups struct
+func (lg ListGroups) IDs() []uint64 {
+	res := make([]uint64, 0, len(lg))
+	for _, g := range lg {
+		res = append(res, g.ID)
+	}
+	return res
+}
+
+// IDs gets array of GroupComputeIDs from ListGroupComputes struct
+func (lgc ListGroupComputes) IDs() []uint64 {
+	res := make([]uint64, 0, len(lgc))
+	for _, gc := range lgc {
+		res = append(res, gc.ID)
+	}
+	return res
+}

pkg/cloudapi/bservice/list.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list BasicService instances
+// ListRequest struct to get list of BasicService instances
 type ListRequest struct {
 	// Find by ID
 	// Required: false
@@ -40,6 +42,15 @@ type ListRequest struct {
 	// Required: false
 	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
+	// Sort by zone id
+	// Default value: 0
+	// Required: false
+	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -49,11 +60,10 @@ type ListRequest struct {
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
-// List gets list BasicService instances associated with the specified Resource Group
+// List gets list of BasicService instances associated with the specified Resource Group as a ListBasicServices struct
 func (b BService) List(ctx context.Context, req ListRequest) (*ListBasicServices, error) {
-	url := "/cloudapi/bservice/list"
 
-	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := b.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -67,3 +77,16 @@ func (b BService) List(ctx context.Context, req ListRequest) (*ListBasicServices
 
 	return &list, nil
 }
+
+// ListRaw gets list of BasicService instances associated with the specified Resource Group as an array of bytes
+func (b BService) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/bservice/list"
+
+	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/bservice/list_deleted.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list of deleted BasicService instances
+// ListDeletedRequest struct to get list of deleted BasicService instances
 type ListDeletedRequest struct {
 	// ID of the account to query for BasicService instances
 	// Required: false
@@ -16,6 +18,10 @@ type ListDeletedRequest struct {
 	// Required: false
 	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -25,8 +31,13 @@ type ListDeletedRequest struct {
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
-// ListDeleted gets list deleted BasicService instances associated with the specified Resource Group
+// ListDeleted gets list of deleted BasicService instances associated with the specified Resource Group
 func (b BService) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListBasicServices, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/bservice/listDeleted"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/bservice/migrate_to_zone.go

@@ -0,0 +1,42 @@
+package bservice
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// MigrateToZone struct to move basic service to another zone
+type MigrateToZoneRequest struct {
+	// ID of the BasicService to move
+	// Required: true
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+
+	// ID of the zone to move
+	// Required: true
+	ZoneID uint64 `url:"zoneId" json:"zoneId" validate:"required"`
+}
+
+// MigrateToZone moves basic service instance to new zone
+func (b BService) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/bservice/migrateToZone"
+
+	res, err := b.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
+}

pkg/cloudapi/bservice/models.go

@@ -88,12 +88,15 @@ type RecordBasicService struct {
 
 	// Whether user controlled
 	UserManaged bool `json:"userManaged"`
+
+	// Zone ID
+	ZoneID uint64 `json:"zoneId"`
 }
 
 // Main information about Compute
 type ItemCompute struct {
 	// Account ID
-	AccountID uint64
+	AccountID uint64 `json:"accountId"`
 
 	// Architecture
 	Architecture string `json:"arch"`
@@ -168,9 +171,18 @@ type ItemSnapshot struct {
 	Valid bool `json:"valid"`
 }
 
-// List of Snapshots
+// List of Snapshot
 type ListSnapshots []ItemSnapshot
 
+// List of Snapshots
+type ListInfoSnapshots struct {
+	// Data
+	Data ListSnapshots `json:"data"`
+
+	// EntryCount
+	EntryCount uint64 `json:"entryCount"`
+}
+
 // Main information about Group
 type RecordGroup struct {
 	// Account ID
@@ -286,6 +298,9 @@ type ItemGroupCompute struct {
 
 	// List of information about OS Users
 	OSUsers ListOSUsers `json:"osUsers"`
+
+	//Chipset
+	Chipset string `json:"chipset"`
 }
 
 // List of Group Computes
@@ -370,6 +385,9 @@ type ItemBasicService struct {
 
 	// User Managed or not
 	UserManaged bool `json:"userManaged"`
+
+	// Zone ID
+	ZoneID uint64 `json:"zoneId"`
 }
 
 // List of BasicServices

pkg/cloudapi/bservice/restore.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for restores BasicService instance
+// RestoreRequest struct to restore BasicService instance
 type RestoreRequest struct {
 	// ID of the BasicService to be restored
 	// Required: true
@@ -19,9 +19,7 @@ type RestoreRequest struct {
 func (b BService) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/restore"

pkg/cloudapi/bservice/snapshot_create.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for create snapshot
+// SnapshotCreateRequest struct to create snapshot
 type SnapshotCreateRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -23,9 +23,7 @@ type SnapshotCreateRequest struct {
 func (b BService) SnapshotCreate(ctx context.Context, req SnapshotCreateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/snapshotCreate"

pkg/cloudapi/bservice/snapshot_delete.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for delete snapshot
+// SnapshotDeleteRequest struct to delete snapshot
 type SnapshotDeleteRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -23,9 +23,7 @@ type SnapshotDeleteRequest struct {
 func (b BService) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/snapshotDelete"

pkg/cloudapi/bservice/snapshot_list.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list existing snapshots
+// SnapshotListRequest struct to get list of existing snapshots
 type SnapshotListRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -16,12 +16,10 @@ type SnapshotListRequest struct {
 }
 
 // SnapshotList gets list existing snapshots of the Basic Service
-func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (ListSnapshots, error) {
+func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListInfoSnapshots, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/snapshotList"
@@ -31,12 +29,12 @@ func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (Li
 		return nil, err
 	}
 
-	list := ListSnapshots{}
+	list := ListInfoSnapshots{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/bservice/snapshot_rollback.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for rollback snapshot
+// SnapshotRollbackRequest struct to rollback snapshot
 type SnapshotRollbackRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -23,9 +23,7 @@ type SnapshotRollbackRequest struct {
 func (b BService) SnapshotRollback(ctx context.Context, req SnapshotRollbackRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/snapshotRollback"

pkg/cloudapi/bservice/start.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for start service
+// StartRequest struct to start service
 type StartRequest struct {
 	// ID of the service to start
 	// Required: true
@@ -21,9 +21,7 @@ type StartRequest struct {
 func (b BService) Start(ctx context.Context, req StartRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/start"

pkg/cloudapi/bservice/stop.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for stop service
+// StopRequest struct to stop service
 type StopRequest struct {
 	// ID of the service to stop
 	// Required: true
@@ -21,9 +21,7 @@ type StopRequest struct {
 func (b BService) Stop(ctx context.Context, req StopRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/bservice/stop"

pkg/cloudapi/compute/abort_shared_snapshot_merge.go

@@ -0,0 +1,42 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// AbortSharedSnapshotMergeRequest struct to abort shared snapshots merge
+type AbortSharedSnapshotMergeRequest struct {
+	// ID of the compute
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+
+	// Label of the snapshot
+	// Required: true
+	Label string `url:"label" json:"label" validate:"required"`
+}
+
+// AbortSharedSnapshotMerge shared snapshots merge abort
+func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/abort_shared_snapshot_merge"
+
+	res, err := c.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
+}

pkg/cloudapi/compute/affinity_group_check_start.go

@@ -7,7 +7,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for check all computes with current affinity label can start
+// AffinityGroupCheckStartRequest struct to check all computes with current affinity label can start
 type AffinityGroupCheckStartRequest struct {
 	// ID of the resource group
 	// Required: true
@@ -22,9 +22,7 @@ type AffinityGroupCheckStartRequest struct {
 func (c Compute) AffinityGroupCheckStart(ctx context.Context, req AffinityGroupCheckStartRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return "", validators.ValidationError(validationError)
-		}
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityGroupCheckStart"

pkg/cloudapi/compute/affinity_label_remove.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for clear affinity label for compute
+// AffinityLabelRemoveRequest struct to clear affinity label for compute
 type AffinityLabelRemoveRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -19,9 +19,7 @@ type AffinityLabelRemoveRequest struct {
 func (c Compute) AffinityLabelRemove(ctx context.Context, req AffinityLabelRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityLabelRemove"

pkg/cloudapi/compute/affinity_label_set.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for set affinity label for compute
+// AffinityLabelSetRequest struct to set affinity label for compute
 type AffinityLabelSetRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -23,9 +23,7 @@ type AffinityLabelSetRequest struct {
 func (c Compute) AffinityLabelSet(ctx context.Context, req AffinityLabelSetRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityLabelSet"

pkg/cloudapi/compute/affinity_relations.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get dict of computes
+// AffinityRelationsRequest struct to get dict of computes
 type AffinityRelationsRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -19,9 +19,7 @@ type AffinityRelationsRequest struct {
 func (c Compute) AffinityRelations(ctx context.Context, req AffinityRelationsRequest) (*RecordAffinityRelations, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityRelations"

pkg/cloudapi/compute/affinity_rule_add.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for add affinity rule
+// AffinityRuleAddRequest struct to add affinity rule
 type AffinityRuleAddRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -38,17 +38,16 @@ type AffinityRuleAddRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleAdd add affinity rule
 func (c Compute) AffinityRuleAdd(ctx context.Context, req AffinityRuleAddRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityRuleAdd"

pkg/cloudapi/compute/affinity_rule_remove.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for remove affinity rule
+// AffinityRuleRemoveRequest struct to remove affinity rule
 type AffinityRuleRemoveRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -38,17 +38,16 @@ type AffinityRuleRemoveRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleRemove remove affinity rule
 func (c Compute) AffinityRuleRemove(ctx context.Context, req AffinityRuleRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityRuleRemove"

pkg/cloudapi/compute/affinity_rules_clear.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for clear affinity rules
+// AffinityRulesClearRequest struct to clear affinity rules
 type AffinityRulesClearRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -19,9 +19,7 @@ type AffinityRulesClearRequest struct {
 func (c Compute) AffinityRulesClear(ctx context.Context, req AffinityRulesClearRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/affinityRulesClear"

pkg/cloudapi/compute/anti_affinity_rule_add.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for add anti affinity rule
+// AntiAffinityRuleAddRequest struct to add anti affinity rule
 type AntiAffinityRuleAddRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -38,17 +38,16 @@ type AntiAffinityRuleAddRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleAdd add anti affinity rule
 func (c Compute) AntiAffinityRuleAdd(ctx context.Context, req AntiAffinityRuleAddRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/antiAffinityRuleAdd"