v1.12.0

.gitignore

@@ -1 +1,10 @@
-cmd/
+cmd/
+.idea/
+.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,12 +1,225 @@
-## Version 1.2.1
+## Version 1.12.0
-
+
-### Bug fixes
+### Удалено
-
+
-#### Legacy Client
+#### account
-
+| Идентификатор<br>задачи | Описание |
-- Fixed password and username encoding 
+| --- | --- |
-- Fixed request params absence in HTTP Transport
+| BGOS-450 | Метод `AddZone` и структура запроса `AddZoneRequest`  в cloudbroker/account |
-
+| BGOS-451 | Метод `RemoveZone` и структура запроса `RemoveZoneRequest`  в cloudbroker/account |
-#### All
+| BGOS-459 | Опциональные поля `ZoneIDs` и `DefaultZoneID` в структуру ответа `RecordAccount` в cloudapi/account и в структуру ответа `InfoAccount` в cloudbroker/account, опциональное поле `DefaultZoneID` в структуру запроса `UpdateRequest` в cloudapi/account и cloudbroker/account и опциональные поля `ZoneIDs` и `DefaultZoneID` в структуру запроса `CreateRequest` в cloudbroker/account |
-
+| BGOS-478 | Опциональное поле `Emails` в структуру `ACL` входящую в структуру ответа `RecordAccount`  в cloudbroker/account |
-- Updated module to new repository
+| BGOS-495 | Поле `AccountID` в структуру ответа `RecordLB` в cloudapi/lb и cloudbroker/lb |
+| BGOS-528 | Значение `trunk` для поля `ComputeFeatures` в cloudbroker/account |
+
+#### bservice
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-361 | Добавлена группа ручек `bservice` в cloudbroker |
+| BGOS-448 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/bservice |
+| BGOS-456 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest`  в cloudbroker/bservice |
+| BGOS-460 | Опциональное поле `ZoneId` в структуру запроса `CreateRequest` и в структуры ответа `RecordBasicService` и `ItemBasicService` в cloudapi/bservice и опциональное поле `ZoneID` в структуру запроса `CreateRequest` и в структуры ответа `RecordBasicService` и `ItemBasicService` в cloudbroker/bservice |
+
+#### compute
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-445 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/compute |
+| BGOS-453 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/compute |
+| BGOS-461 | Поле `ZoneID` в структуры ответа `RecordCompute` и `ItemComputeDisk` в cloudapi/compute и поле `ZoneID` в структуры ответа `RecordCompute` и `InfoCompute` в cloudbroker/compute |
+| BGOS-491 | Методы `AbortSharedSnapshotMerge` и `SharedSnapshotMergeStatus` и структуры запроса `AbortSharedSnapshotMergeRequest` и `SharedSnapshotMergeStatusRequest` в cloudapi/compute и cloudbroker/compute |
+| BGOS-493 | Метод `GuestAgentDisable` и структура запроса `GuestAgentDisableRequest` в cloudapi/compute и в cloudbroker/compute|
+| BGOS-493 | Метод `GuestAgentEnable` и структура запроса `GuestAgentEnableRequest` в cloudapi/compute и в cloudbroker/compute|
+| BGOS-493 | Метод `GuestAgentExecuteRequest` и структура запроса `GuestAgentExecuteRequest` в cloudapi/compute и в cloudbroker/compute|
+| BGOS-493 | Метод `GuestAgentFeatureUpdateRequest` и структура запроса `GuestAgentFeatureUpdateRequest` в cloudapi/compute и в cloudbroker/compute|
+| BGOS-493 | Метод `GuestAgentFeatureGetRequest` и структура запроса `GuestAgentFeatureGetRequest` в cloudapi/compute и в cloudbroker/compute|
+| BGOS-497 | Метод `AsyncMigrate` в cloudbroker/compute |
+| BGOS-505 | Поддержка NetType `SDN` и `TRUNK` структурах запросов `Interface` и `NetAttachRequest` в cloudapi/compute и cloudbroker/compute |
+| BGOS-505 | Опциональное поле  `SDNInterfaceID` в структуру запроса `Interface` в cloudapi/compute и cloudbroker/compute |
+| BGOS-506 | Поле  `SDNInterfaceID` в структуру ответа `ItemVNFInterface` в cloudapi/compute|
+| BGOS-506 | Поле  `SDNInterfaceID` в структуру ответа `ItemInterface` в cloudbroker/compute |
+| BGOS-510 | Поддержка NetType `EMPTY` структурах запросов `NetAttachRequest` в cloudapi/compute и cloudbroker/compute |
+| BGOS-535 | Метод `ChangeMTU` и структура запроса `ChangeMTURequest` в cloudapi/compute и cloudbroker/compute |
+| BGOS-509 | Опциональное поле  `SDNInterfaceID` в структуру запроса `NetAttachRequest` в cloudapi/compute и cloudbroker/compute |
+| BGOS-543 | Поля `LiveMigrationJobID` и `QemuQuest` и структура ответа `QemuQuest` в структуры ответа `ItemCompute`, `RecordCompute` в cloudapi/compute и `RecordCompute`, `InfoCompute` в cloudbroker/compute |
+
+#### extnet
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-452 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/extnet |
+| BGOS-462 | Поле `ZoneID` в структуру ответа `RecordExtNet` в cloudapi/extnet и поле `ZoneID` в структуры ответа `RecordExtNet` и `ItemExtNet` в cloudbroker/extnet |
+| BGOS-462 | Опциональное поле `ZoneID` в структуру запроса `CreateRequest` в cloudbroker/extnet |
+| BGOS-534 | Опциональное поле `MTU` в структуры запроса `CreateRequest` и `UpdateRequest` в cloudbroker/extnet |
+| BGOS-534 | Поле `MTU` в структуру ответа `RecordExtNet` в cloudapi/extnet и в структуры ответа `ItemExtNet` и `RecordExtNet` в cloudbroker/extnet |
+| BGOS-530 | Метод `SetHAMode` и структура запроса `SetHAModeRequest` в cloudbroker/extnet |
+| BGOS-531 | Опциональные поля `PriVNFDevIP`, `SecVNFDevIP` и `HAMode` в структуру запроса `CreateRequest` в cloudbroker/extnet |
+| BGOS-531 | Опциональное поле `Device` в структуру запроса `DeviceMigrateRequest` в cloudbroker/extnet |
+| BGOS-531 | Поля `SecVNFDevID` и `Redundant` в структуры ответа `ItemExtNet` и `RecordExtNet` в cloudbroker/extnet |
+| BGOS-531 | Поля `SecVNFDevID` и `Redundant` в структуру ответа `RecordExtNet` в cloudapi/extnet |
+| BGOS-544 | Поле `PreReservations` в структуру ответа `RecordExtNet` в cloudapi/extnet и cloudbroker/extnet |
+
+#### grid
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-549 | Поля `NetworkModes`, `SDNSupport` в структуры ответа `ItemGridList` и `RecordGrid` в cloudbroker/grid |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-481 | Метод `AsyncCreate` в cloudapi/image |
+
+#### k8s
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-449 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/k8s |
+| BGOS-463 | Поле `ZoneID` в структуры ответа `RecordK8S` и `ItemK8SCluster` в cloudapi/k8s и поле `ZoneID` в структуры ответа `RecordK8S` и `ItemK8S` в cloudbroker/k8s |
+| BGOS-463 | Опциональное поле `ZoneID` в структуру запроса `CreateRequest` в cloudapi/k8s и в cloudbroker/k8s |
+| BGOS-457 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/k8s |
+
+#### kvmx86
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-466 | Опциональное поле `ZoneID` в структуры запроса `CreateRequest` и `CreateBlankRequest` в cloudapi/kvmx86 и в структуры запроса `CreateRequest`, `CreateBlankRequest` и `MassCreateRequest` в cloudbroker/kvmx86 |
+
+#### lb
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-447 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/lb |
+| BGOS-455 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/lb |
+| BGOS-464 | Поле `ZoneID` в структуру ответа `RecordLB` в cloudapi/lb и поле `ZoneID` в структуры ответа `RecordLB` и `ItemLBList` в cloudbroker/lb |
+| BGOS-464 | Опциональное поле `ZoneID` в структуру запроса `CreateRequest` в cloudapi/lb и в cloudbroker/lb |
+
+#### locations
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-546 | Поле `NetworkModes` в структуре ответа `ItemLocation` в cloudapi/locations |
+| BGOS-546 | Метод `ListGet` в cloudapi/locations |
+
+#### node
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-484 | Новое значение `is_powered` в поле `action` в структуре запроса `ApplyIpmiActionRequest` в cloudbroker/node |
+| BGOS-547 | Поля `SDNHypervisorName` и `ZoneID` в структуру ответа `ItemNode` и поле `ZoneID` в структуру ответа `RecordNode` в cloudbroker/node |
+
+#### rg
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-504 | Поле `SDNAccessGroupID` в структуру запроса `CreateRequest` в cloudapi/rg и cloudbroker/rg |
+| BGOS-504 | Поле `SDNAccessGroupID` в структуры ответа `RecordResourceGroup`, `ItemResourceGroup` в cloudapi/rg и в структуру ответа `ItemRG` в cloudbroker/rg |
+| BGOS-528 | Значение `trunk` для поля `ComputeFeatures` в cloudbroker/rg |
+
+#### trunk
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-527 | Группа ручек `trunk` в cloudapi и в cloudbroker |
+
+#### vins
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-446 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/vins |
+| BGOS-454 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/vins |
+| BGOS-465 | Поле `ZoneID` в структуру ответа `RecordVINS` в cloudapi/vins и в структуры ответа `RecordVINS` и `ItemVINS` в cloudbroker/vins |
+| BGOS-465 | Опциональное поле `ZoneID` в структуры запроса `CreateInRGRequest` и `CreateInAccountRequest` в cloudapi/vins и в cloudbroker/vins |
+| BGOS-550 | Поле `SDNAccessGroupID` в структуру ответа `ItemVNFInterface` в cloudapi/vins и в структуру ответа `ItemInterface` в cloudbroker/vins |
+
+#### zone
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-435 | Добавлена группа ручек zone в cloudapi и в cloudbroker |
+
+#### user
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-494 | Опциональное поле `Provider` в структурe запроса `CreateRequest` в cloudbroker/user |
+| BGOS-526 | Опциональное поле `Email` в структуру запроса `ListRequest` в cloudbroker/user |
+| BGOS-502 | Поле `Blocked` в структуру ответа `ItemUser`, методы `Block` и `Unblock` и структуры запроса `BlockRequest` и `UnblockRequest` в cloudbroker/user |
+
+### Исправлено
+
+#### account
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-512 | Исправлено возвращаемое значение с bool на string в методах `Delete` и `Restore` в cloudapi/account и в методах `Delete`, `Restore`, `DeleteAccounts`, `DisableAccounts` и `EnableAccounts` в cloudbroker/account |
+
+#### bservice
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-483 | Изменен тип параметра `Permanently` на опциональный в структуре `DeleteRequest` в cloudbroker/bservice |
+
+#### compute
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-433 | Исправлена ошибка валидации поля LoaderType для всех структур в cloudapi/compute и в cloudbroker/compute |
+| BGOS-458 | Изменен тип параметров `CPUPin`, `HPBacked`, `AutoStart`, `HotResize` с bool на interface в структуре `UpdateRequest` cloudapi/compute и в cloudbroker/compute |
+| BGOS-503 | Исправлен тип поля `Explicit` cо string на bool в структурах ответа `ItemComputeACL` в cloudbroker/compute |
+| BGOS-537 | В методе `GetLog` вызов api осуществляется с методом get в cloudapi/compute и в cloudbroker/compute |
+
+#### disk
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-468 | Исправлен тип поля `UpdatedBy` c uint64 на string в структурах ответа `ItemComputeDisk` в cloudapi/compute и `ItemDisk` в cloudbroker/compute |
+
+#### extnet
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-548 | В структурах ответа `RecordExtNet` в cloudapi/extnet и cloudbroker/extnet и `ItemExtNet` в cloudbroker/extnet поле `networkID` заменено на поле `networkIDs` |
+
+#### flipgroup
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-482 | Изменен тип параметра `ClientType` на опциональный в структуре `CreateRequest` в cloudapi/bservice и cloudbroker/bservice |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-481 | Метод `SyncCreate` заменен на метод `AsyncCreateImage` со структурой запроса `CreateRequest` в cloudbroker/image |
+
+#### lb
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-538 | Изменен тип поля `SysctlParams` в структурах ответа `RecordLB` и `ItemLBList` в cloudapi/lb и cloudbroker/lb |
+
+#### rg
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-540 | Тип возвращаемого значения методов `MassEnable`, `MassDisable`, `MassDelete` с bool на string в cloudbroker/rg |
+
+### Удалено
+
+#### account
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-541 | Опциональное поле `Reason` в структуре запроса `DisableEnableRequest` в cloudapi/account |
+| BGOS-541 | Опциональное поле `Reason` в структурах запроса `DeleteRequest`, `DisableRequest`, `DisableAccountsRequest`, `RestoreRequest` в cloudbroker/account |
+
+#### compute
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-536 | Поля `Order` и `VMID` в структуре ответа `ItemComputeDisk` в cloudapi/compute и в структуре ответа `ItemDisk` в cloudbroker/compute |
+| BGOS-551 | Значение `SVA_KVM_X86` в поле `Driver` в структурах запроса `CreateRequest` и `CreateBlankRequest` в cloudapi/compute |
+
+#### disks
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-480 | Опциональное поле `Architecture` в структурах запроса `FromPlatformDiskRequest` в cloudapi/disks и в cloudbroker/disks |
+
+#### extnet
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-531 | Опциональное поле `VNFDevIP` в структуре запроса `CreateRequest` в cloudbroker/extnet |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-480 | Опциональное поле `Architecture` в структурах запроса `CreateRequest`, `ListRequest` в cloudapi/image и `CreateRequest`, `ListRequest`, `CreateCDROMImageRequest` в cloudbroker/image |
+| BGOS-489 | Поле `Meta` в структуре ответа `ItemListStacks` в cloudbroker/image |
+
+#### tasks
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-500 | Опциональное поле `GUID` в структурах ответа `ItemAsyncTask` в cloudapi/tasks и `ItemTask` в cloudbroker/tasks |
+
+#### user
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-494 | Опциональное поле `Groups` в структурe запроса `CreateRequest` в cloudbroker/user |
+

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 github.com/rudecs/decort-sdk
-```
-
-## API List
-
-## Examples
-
-```go
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/rudecs/decort-sdk/config"
-	"github.com/rudecs/decort-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,88 @@
+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 {
+		return nil, err
+	}
+
+	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 {
+		return nil, err
+	}
+
+	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 {
+		return nil, err
+	}
+
+	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,35 @@
 package decortsdk
 
 import (
+	"bytes"
 	"context"
-	"errors"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
 	"io"
+	"mime/multipart"
 	"net/http"
+	"reflect"
+	"strconv"
 	"strings"
-
+	"sync"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
+	"time"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 
 	"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"
 )
 
-// HTTP-client for platform
+// DecortClient is HTTP-client for platform
 type DecortClient struct {
-	decortURL string
+	decortURL  string
-	client    *http.Client
+	client     *http.Client
+	cfg        config.Config
+	expiryTime time.Time
+	mutex      *sync.Mutex
 }
 
 // Сlient builder
@@ -27,9 +38,25 @@ func New(cfg config.Config) *DecortClient {
 		cfg.Retries = 5
 	}
 
+	var expiryTime time.Time
+
+	if cfg.Token != "" {
+		expiryTime = time.Now().AddDate(0, 0, 1)
+	}
+
 	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),
+		expiryTime: expiryTime,
+		mutex:      &sync.Mutex{},
 	}
 }
 
@@ -45,31 +72,306 @@ func (dc *DecortClient) CloudBroker() *cloudbroker.CloudBroker {
 
 // 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())
+	// get token
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, body)
+	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 {
+	if err != nil || resp == nil {
-		return nil, err
+		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)
+	dc.cfg.Token = token
+	dc.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 (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 {
+	req.Body.Close()
-		return nil, errors.New(string(respBytes))
+	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
 }

client_bvs.go

@@ -0,0 +1,395 @@
+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
+}
+
+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

@@ -1,39 +1,101 @@
 package config
 
+import (
+	"encoding/json"
+	"os"
+	"time"
+
+	"gopkg.in/yaml.v3"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
 // Configuration for creating request to platform
 type Config struct {
 	// JWT platform token
 	// Required: false
 	// Example: "qwqwdfwv68979we0q9bfv7e9sbvd89798qrwv97ff"
-	Token string
+	Token string `json:"token" yaml:"token"`
 
 	// Application (client) identifier for authorization
 	// in the cloud platform controller in oauth2 mode.
 	// Required: true
 	// Example: "ewqfrvea7s890avw804389qwguf234h0otfi3w4eiu"
-	AppID string
+	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
+	AppSecret string `json:"appSecret" yaml:"appSecret" validate:"required"`
 
 	// Platform authentication service address
 	// Required: true
 	// Example: "https://sso.digitalenergy.online"
-	SSOURL string
+	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
+	DecortURL string `json:"decortUrl" yaml:"decortUrl" validate:"url"`
 
 	// Amount platform request attempts
 	// Default value: 5
 	// Required: false
-	Retries uint64
+	Retries uint64 `json:"retries" yaml:"retries"`
 
-	// Skip verify, true by default
+	// Skip verify
 	// Required: false
-	SSLSkipVerify bool
+	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
+
+	// HTTP client timeout, unlimited if left empty
+	// Required: false
+	Timeout Duration `json:"timeout" yaml:"timeout"`
+}
+
+// SetTimeout is used to set HTTP client timeout.
+func (c *Config) SetTimeout(dur time.Duration) {
+	c.Timeout = Duration(dur)
+}
+
+// ParseConfigJSON parses Config from specified JSON-formatted file.
+func ParseConfigJSON(path string) (Config, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Config{}, err
+	}
+
+	var config Config
+
+	err = json.Unmarshal(file, &config)
+	if err != nil {
+		return Config{}, err
+	}
+
+	err = validators.ValidateConfig(config)
+	if err != nil {
+		return Config{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return config, nil
+}
+
+// ParseConfigYAML parses Config from specified YAML-formatted file.
+func ParseConfigYAML(path string) (Config, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Config{}, err
+	}
+
+	var config Config
+
+	err = yaml.Unmarshal(file, &config)
+	if err != nil {
+		return Config{}, err
+	}
+
+	err = validators.ValidateConfig(config)
+	if err != nil {
+		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

@@ -1,33 +1,95 @@
 package config
 
+import (
+	"encoding/json"
+	"os"
+	"time"
+
+	"gopkg.in/yaml.v3"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
 // Legacy client configuration
 type LegacyConfig struct {
 	// ServiceAccount username
 	// Required: true
 	// Example : "osh_mikoev"
-	Username string
+	Username string `json:"username" yaml:"username" validate:"required"`
 
 	// ServiceAccount password
 	// Required: true
 	// Example: "[1o>hYkjnJr)HI78q7t&#%8Lm"
-	Password string
+	Password string `json:"password" yaml:"password" validate:"required"`
 
 	// Platform token
 	// Required: false
 	// Example: "158e76424b0d4810b6086hgbhj928fc4a6bc06e"
-	Token string
+	Token string `json:"token" yaml:"token"`
 
 	// Address of the platform on which the actions are planned
 	// Required: true
 	// Example: "https://mr4.digitalenergy.online"
-	DecortURL string
+	DecortURL string `json:"decortUrl" yaml:"decortUrl" validate:"url"`
 
 	// Amount platform request attempts
 	// Default value: 5
 	// Required: false
-	Retries uint64
+	Retries uint64 `json:"retries" yaml:"retries"`
 
-	// Skip verify, true by default
+	// Skip verify
 	// Required: false
-	SSLSkipVerify bool
+	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
+
+	// HTTP client timeout, unlimited if left empty
+	// Required: false
+	Timeout Duration `json:"timeout" yaml:"timeout"`
+}
+
+// SetTimeout is used to set HTTP client timeout.
+func (c *LegacyConfig) SetTimeout(dur time.Duration) {
+	c.Timeout = Duration(dur)
+}
+
+// ParseLegacyConfigJSON parses LegacyConfig from specified JSON-formatted file.
+func ParseLegacyConfigJSON(path string) (LegacyConfig, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return LegacyConfig{}, err
+	}
+
+	var config LegacyConfig
+
+	err = json.Unmarshal(file, &config)
+	if err != nil {
+		return LegacyConfig{}, err
+	}
+
+	err = validators.ValidateConfig(config)
+	if err != nil {
+		return LegacyConfig{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return config, nil
+}
+
+// ParseLegacyConfigYAML parses LegacyConfig from specified YAML-formatted file.
+func ParseLegacyConfigYAML(path string) (LegacyConfig, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return LegacyConfig{}, err
+	}
+
+	var config LegacyConfig
+
+	err = yaml.Unmarshal(file, &config)
+	if err != nil {
+		return LegacyConfig{}, err
+	}
+
+	err = validators.ValidateConfig(config)
+	if err != nil {
+		return LegacyConfig{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return config, nil
 }

config/timeouts.go

@@ -0,0 +1,54 @@
+package config
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+// Duration is a wrapper around time.Duration (used for better user experience)
+type Duration time.Duration
+
+func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var v interface{}
+	if err := unmarshal(&v); err != nil {
+		return err
+	}
+	switch value := v.(type) {
+	case string:
+		tmp, err := time.ParseDuration(value)
+		if err != nil {
+			return err
+		}
+		*d = Duration(tmp)
+		return nil
+	case float64:
+		return nil
+	default:
+		return fmt.Errorf("invalid duration %v", value)
+	}
+}
+
+func (d *Duration) UnmarshalJSON(b []byte) error {
+	var v interface{}
+	if err := json.Unmarshal(b, &v); err != nil {
+		return err
+	}
+	switch value := v.(type) {
+	case string:
+		tmp, err := time.ParseDuration(value)
+		if err != nil {
+			return err
+		}
+		*d = Duration(tmp)
+		return nil
+	case float64:
+		return nil
+	default:
+		return fmt.Errorf("invalid duration %v", value)
+	}
+}
+
+func (d *Duration) Get() time.Duration {
+	return time.Duration(*d)
+}

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,13 +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/crypto v0.15.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -1,3 +1,4 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -7,24 +8,33 @@ 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=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 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.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+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=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

interfaces/caller.go

@@ -6,4 +6,7 @@ import "context"
 type Caller interface {
 	// DecortApiCall method for sending requests to the platform
 	DecortApiCall(ctx context.Context, method, url 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,40 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"net/http"
-	"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,
-			//TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-
-		Timeout: 5 * time.Minute,
-	}
-}

internal/client/legacy-http-client.go

@@ -1,33 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"net/http"
-	"net/url"
-	"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,
-		},
-	}
-
-	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,
-		},
-
-		Timeout: 5 * time.Minute,
-	}
-}

internal/client/legacy-transport.go

@@ -1,70 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-)
-
-type transportLegacy struct {
-	base      http.RoundTripper
-	username  string
-	password  string
-	retries   uint64
-	token     string
-	decortURL string
-}
-
-func (t *transportLegacy) RoundTrip(request *http.Request) (*http.Response, error) {
-	if t.token == "" {
-		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
-	}
-
-	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++ {
-		resp, err = t.base.RoundTrip(req)
-		if err == nil {
-			if resp.StatusCode == 200 {
-				return resp, nil
-			}
-			respBytes, _ := io.ReadAll(resp.Body)
-			err = fmt.Errorf("%s", respBytes)
-			resp.Body.Close()
-		}
-
-		time.Sleep(time.Second * 5)
-	}
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}

internal/client/transport.go

@@ -1,67 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-)
-
-type transport struct {
-	base         http.RoundTripper
-	retries      uint64
-	clientID     string
-	clientSecret string
-	token        string
-	ssoURL       string
-	expiryTime   time.Time
-}
-
-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)
-
-		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++ {
-		resp, err = t.base.RoundTrip(req)
-		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,18 @@
+package constants
+
+const (
+	RESTMACHINE = "/restmachine"
+
+	// RAM_DIVISIBILITY sets divisibility of RAM value
+	RAM_DIVISIBILITY uint64 = 128
+)
+
+var FileName = map[string]string{
+	"OidcCertificate": "ca.crt",
+}
+
+var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
+
+var VersionMap = map[string]string{
+	"4.3.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,89 +1,210 @@
 package validators
 
-import "github.com/go-playground/validator/v10"
+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 create.
+func computeDriverValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, computeDriverValues)
+}
+
+// protoValidator is used to validate Proto fields.
+func protoValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	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 IsInSlice(fieldValue, accessTypeValues)
+}
+
+// resTypesValidator is used to validate ResTypes fields.
+func resTypesValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	for _, value := range fieldSlice {
+		if !IsInSlice(value, resTypesValues) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// driverValidator is used to validate Driver fields.
+func driverValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(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)
-}
-
-// accountAccessTypeValidator is used to validate AccessType field.
-func accountAccessTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, accountAccessTypeValues)
-}
-
-// bserviceDriverValidator is used to validate Driver field.
-func bserviceDriverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, bserviceDriverValues)
 }
 
 // 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)
 }
 
-// computeProtoValidator is used to validate Proto field.
+// computex86NetTypeValidator is used to validate NetType field.
-func computeProtoValidator(fe validator.FieldLevel) bool {
+func computex86NetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeProtoValues)
+	return IsInSlice(fieldValue, computex86NetTypeValues)
+}
+
+// computeOrderValidator is used to validate Order field.
+func computeOrderValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	for _, value := range fieldSlice {
+		if !IsInSlice(value, computeOrderValues) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// computeDataDisksValidator is used to validate DataDisks field.
+func computeDataDisksValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, computeDataDisksValues)
+}
+
+// diskTypeValidator is used to validate Type field.
+func diskTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, diskTypeValues)
+}
+
+// flipgroupClientTypeValidator is used to validate ClientType field.
+func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, flipgroupClientTypeValues)
+}
+
+// kvmNetTypeValidator is used to validate NetType field.
+func kvmNetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, kvmNetTypeValues)
+}
+
+// lbAlgorithmValidator is used to validate Algorithm field.
+func lbAlgorithmValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, lbAlgorithmValues)
+}
+
+// rgDefNetValidator is used to validate DefNet field.
+func rgDefNetValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, rgDefNetValues)
+}
+
+// rgNetTypeValidator is used to validate NetType field.
+func rgNetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, rgNetTypeValues)
+}
+
+// vinsTypeValidator is used to validate Type field.
+func vinsTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	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)
+	return IsInSlice(fieldValue, imageTypeValues)
 }
 
 // imageDriversValidator is used to validate Drivers field.
@@ -94,7 +215,7 @@ func imageDriversValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, item := range fieldSlice {
-		if !StringInSlice(item, imageDriversValues) {
+		if !IsInSlice(item, imageDriversValues) {
 			return false
 		}
 	}
@@ -106,5 +227,242 @@ func imageDriversValidator(fe validator.FieldLevel) bool {
 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 IsInSlice(fieldValue, sepFieldTypeValues)
+}
+
+// hwPathValidator is used to validate HWPath field.
+func hwPathValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	ok, _ := regexp.MatchString(`^\b[0-9a-f]{4}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}.\d{1}$`, fieldValue)
+
+	return ok
+}
+
+// networkPluginValidator is used to validate NetworkPlugin field
+func networkPluginValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, networkPluginValues)
+}
+
+// networkPluginsValidator is used to validate NetworkPlugins field
+func networkPluginsValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	for _, item := range fieldSlice {
+		item = strings.ToLower(item)
+
+		if !IsInSlice(item, networkPluginValues) {
+			return false
+		}
+	}
+
+	return true
+}
+
+func interfaceStateValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	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 IsInSlice(fieldValue, strictLooseValues)
+}
+
+// name workerGroup must be more 3 symbol
+func workerGroupNameValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.Trim(fieldValue, " ")
+
+	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"
 )
@@ -11,16 +12,29 @@ func ValidateRequest(req interface{}) error {
 	return validate.Struct(req)
 }
 
+func ValidateConfig(cfg interface{}) error {
+	validate := getDecortValidator()
+	return validate.Struct(cfg)
+}
+
 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
@@ -28,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

@@ -12,7 +12,7 @@ func errorMessage(fe validator.FieldError) string {
 
 	switch fe.Tag() {
 
-	// Default Validators
+	// Common Validators
 	case "required":
 		return fmt.Sprintf("%s %s is required", prefix, fe.Field())
 	case "gt":
@@ -25,14 +25,41 @@ 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 "isBool":
+		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
-	// Account Validators
+	case "driver":
-	case "accountAccessType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
-		return fmt.Sprintf("%s %s must be one of the followng: %s",
 			prefix,
 			fe.Field(),
-			joinValues(accountAccessTypeValues))
+			joinValues(driverValues))
 
+	case "accessType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(accessTypeValues))
+
+	case "resTypes":
+		return fmt.Sprintf("%s %s can contain only the following values: %s",
+			prefix,
+			fe.Field(),
+			joinValues(resTypesValues))
+
+	case "proto":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			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",
 			prefix,
@@ -40,12 +67,6 @@ func errorMessage(fe validator.FieldError) string {
 			joinValues(accountCUTypeValues))
 
 	// BService Validators
-	case "bserviceDriver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(bserviceDriverValues))
-
 	case "bserviceMode":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -77,20 +98,98 @@ 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,
 			fe.Field(),
 			joinValues(computeNetTypeValues))
 
-	case "computeProto":
+	case "computeOrder":
+		return fmt.Sprintf("%s %s can contain only the following values: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computeOrderValues))
+
+	case "computeDataDisks":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
-			joinValues(computeProtoValues))
+			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",
+			prefix,
+			fe.Field(),
+			joinValues(diskTypeValues))
+
+	// Flipgroup Validators
+	case "flipgroupClientType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(flipgroupClientTypeValues))
+
+		// k8s Validators
+	case "workerGroupName":
+		return fmt.Sprintf("%s %s must be more 3 symbol",
+			prefix,
+			fe.Field())
+
+	// KVM_X86 Validators
+	case "kvmNetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(kvmNetTypeValues))
+
+	// LB Validators
+	case "lbAlgorithm":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(lbAlgorithmValues))
+
+	// RG Validators
+	case "rgDefNet":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(rgDefNetValues))
+
+	case "rgNetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(rgNetTypeValues))
+
+	// ViNS Validators
+	case "vinsType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(vinsTypeValues))
 
 	// Image Validators
-	case "bootType":
+	case "imageBootType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
@@ -114,6 +213,145 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(imageArchitectureValues))
 
+	// SEP Validators
+	case "sepFieldType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(sepFieldTypeValues))
+
+	// HWPath Validators
+	case "hwPath":
+		return fmt.Sprintf("%s %s must be in format 0000:1f:2b.0",
+			prefix,
+			fe.Field())
+
+	// Network plugin Validators
+	case "networkPlugin":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(networkPluginValues))
+
+	case "networkPlugins":
+		return fmt.Sprintf("%s %s must contain only the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(networkPluginValues))
+
+	case "strict_loose":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(strictLooseValues))
+
+	case "interfaceState":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			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))
+
+	// 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

@@ -7,34 +7,56 @@ import (
 )
 
 var (
-	once     sync.Once
+	once            sync.Once
-	instance *DecortValidator
+	decortValidator = validator.New()
 )
 
-type DecortValidator struct {
-	decortValidator *validator.Validate
-}
-
 // getDecortValidator returns singleton instance of DecortValidator.
 func getDecortValidator() *validator.Validate {
-	if instance == nil {
+	once.Do(func() {
-		once.Do(func() {
+		err := registerAllValidators(decortValidator)
-			instance = new(DecortValidator)
+		if err != nil {
-			instance.decortValidator = validator.New()
+			panic(err)
+		}
+	})
 
-			err := registerAllValidators(instance.decortValidator)
+	return decortValidator
-			if err != nil {
-				panic(err)
-			}
-		})
-	}
-
-	return instance.decortValidator
 }
 
 // registerAllValidators registers all custom validators in DecortValidator.
 func registerAllValidators(validate *validator.Validate) error {
-	err := validate.RegisterValidation("bootType", imageBootTypeValidator)
+
+	err := validate.RegisterValidation("proto", protoValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("accessType", accessTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("resTypes", resTypesValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("driver", driverValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
 	if err != nil {
 		return err
 	}
@@ -54,21 +76,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("accountAccessType", accountAccessTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("accountCUType", accountCUTypeValidator)
 	if err != nil {
 		return err
 	}
 
-	err = validate.RegisterValidation("bserviceDriver", bserviceDriverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("bserviceMode", bserviceModeValidator)
 	if err != nil {
 		return err
@@ -99,7 +111,192 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("computeProto", computeProtoValidator)
+	err = validate.RegisterValidation("computex86NetType", computex86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("computeOrder", computeOrderValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("computeDataDisks", computeDataDisksValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("diskType", diskTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("flipgroupClientType", flipgroupClientTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("kvmNetType", kvmNetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("lbAlgorithm", lbAlgorithmValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("rgDefNet", rgDefNetValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("rgNetType", rgNetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("vinsType", vinsTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("sepFieldType", sepFieldTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("hwPath", hwPathValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("networkPlugin", networkPluginValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("networkPlugins", networkPluginsValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("strict_loose", strictLooseValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("interfaceState", interfaceStateValidator)
+	if err != nil {
+		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
 	}

internal/validators/values.go

@@ -1,21 +1,87 @@
 package validators
 
 var (
-	accountAccessTypeValues = []string{"R", "RCX", "ARCXDU"}
+	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
-	accountCUTypeValues     = []string{"CU_M", "CU_C", "CU_D", "CU_S", "CU_A", "CU_NO", "CU_I", "CU_NP"}
 
-	bserviceDriverValues = []string{"KVM_X86, KVM_PPC"}
+	driverValues     = []string{"KVM_X86"}
-	bserviceModeValues   = []string{"ABSOLUTE", "RELATIVE"}
+	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
+	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
+	protoValues      = []string{"tcp", "udp"}
 
-	computeTopologyValues = []string{"compute", "node"}
+	accountCUTypeValues = []string{"CU_M", "CU_C", "CU_D", "CU_DM", "CU_S", "CU_A", "CU_NO", "CU_I", "CU_NP"}
-	computePolicyValues   = []string{"RECOMMENDED", "REQUIRED"}
+
-	computeModeValues     = []string{"EQ", "EN", "ANY"}
+	bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
-	computeDiskTypeValues = []string{"D", "B"}
+
-	computeNetTypeValues  = []string{"EXTNET", "VINS"}
+	computeTopologyValues   = []string{"compute", "node"}
-	computeProtoValues    = []string{"tcp", "udp"}
+	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"}
+	computeDriverValues     = []string{"KVM_X86"}
+
+	diskTypeValues = []string{"B", "T", "D"}
+
+	flipgroupClientTypeValues = []string{"compute", "vins"}
+
+	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", "EXCLUDED"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
-	imageTypeValues         = []string{"windows", "linux", "other"}
+	imageTypeValues         = []string{"windows", "linux", "unknown"}
 	imageDriversValues      = []string{"KVM_X86"}
-	imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
+	imageArchitectureValues = []string{"X86_64"}
+
+	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
+
+	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"}
+)
+
+const (
+	mtuMin = 1
+	mtuMax = 9216
+
+	trunkTagsMin = 1
+	trunkTagsMax = 4095
 )

legacy-client.go

@@ -1,23 +1,31 @@
 package decortsdk
 
 import (
+	"bytes"
 	"context"
-	"errors"
+	"crypto/tls"
+	"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
+	decortURL  string
-	client    *http.Client
+	client     *http.Client
+	cfg        config.LegacyConfig
+	expiryTime time.Time
+	mutex      *sync.Mutex
 }
 
 // Legacy client builder
@@ -26,9 +34,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 +68,181 @@ 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())
+	// perform request
-	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, body)
+	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 {
+	if err != nil || resp == nil {
-		return nil, err
+		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 {
+	req.Body.Close()
-		return nil, errors.New(string(respBytes))
+	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
@@ -23,16 +23,14 @@ type AddUserRequest struct {
 	//	- 'RCX' for Write
 	//	- 'ARCXDU' for Admin
 	// Required: true
-	AccessType string `url:"accesstype" json:"accesstype" validate:"required,accountAccessType"`
+	AccessType string `url:"accesstype" json:"accesstype" validate:"required,accessType"`
 }
 
 // AddUser gives a user access rights.
 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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	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,omitempty" json:"sendAccessEmails,omitempty"`
-
-	// 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 "", validators.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/enable"

pkg/cloudapi/account/filter.go

@@ -48,21 +48,23 @@ func (la ListAccounts) FilterByUserGroupID(userGroupID string) ListAccounts {
 func (la ListAccounts) FilterFunc(predicate func(ItemAccount) bool) ListAccounts {
 	var result ListAccounts
 
-	for _, acc := range la {
+	for _, acc := range la.Data {
 		if predicate(acc) {
-			result = append(result, acc)
+			result.Data = append(result.Data, acc)
 		}
 	}
 
+	result.EntryCount = uint64(len(result.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemAccount.
 // If none was found, returns an empty struct.
 func (la ListAccounts) FindOne() ItemAccount {
-	if len(la) == 0 {
+	if len(la.Data) == 0 {
 		return ItemAccount{}
 	}
 
-	return la[0]
+	return la.Data[0]
 }

pkg/cloudapi/account/filter_test.go

@@ -5,68 +5,71 @@ import (
 )
 
 var accounts = ListAccounts{
-	ItemAccount{
+	Data: []ItemAccount{
-		ACL: []RecordACL{
+		{
-			{
+			ACL: []RecordACL{
-				IsExplicit: true,
+				{
-				GUID:       "",
+					IsExplicit: true,
-				Rights:     "CXDRAU",
+					GUID:       "",
-				Status:     "CONFIRMED",
+					Rights:     "CXDRAU",
-				Type:       "U",
+					Status:     "CONFIRMED",
-				UgroupID:   "timofey_tkachev_1@decs3o",
+					Type:       "U",
+					UgroupID:   "timofey_tkachev_1@decs3o",
+				},
 			},
+			CreatedTime: 1676645275,
+			DeletedTime: 0,
+			ID:          132846,
+			Name:        "std",
+			Status:      "CONFIRMED",
+			UpdatedTime: 1676645275,
 		},
-		CreatedTime: 1676645275,
+		{
-		DeletedTime: 0,
+			ACL: []RecordACL{
-		ID:          132846,
+				{
-		Name:        "std",
+					IsExplicit: true,
-		Status:      "CONFIRMED",
+					GUID:       "",
-		UpdatedTime: 1676645275,
+					Rights:     "CXDRAU",
-	},
+					Status:     "CONFIRMED",
-	ItemAccount{
+					Type:       "U",
-		ACL: []RecordACL{
+					UgroupID:   "not_really_timofey_tkachev_1@decs3o",
-			{
+				},
-				IsExplicit: true,
-				GUID:       "",
-				Rights:     "CXDRAU",
-				Status:     "CONFIRMED",
-				Type:       "U",
-				UgroupID:   "not_really_timofey_tkachev_1@decs3o",
 			},
+			CreatedTime: 1676878820,
+			DeletedTime: 0,
+			ID:          132847,
+			Name:        "std_2",
+			Status:      "CONFIRMED",
+			UpdatedTime: 1676645275,
 		},
-		CreatedTime: 1676878820,
+		{
-		DeletedTime: 0,
+			ACL: []RecordACL{
-		ID:          132847,
+				{
-		Name:        "std_2",
+					IsExplicit: true,
-		Status:      "CONFIRMED",
+					GUID:       "",
-		UpdatedTime: 1676645275,
+					Rights:     "CXDRAU",
-	},
+					Status:     "CONFIRMED",
-	ItemAccount{
+					Type:       "U",
-		ACL: []RecordACL{
+					UgroupID:   "timofey_tkachev_1@decs3o",
-			{
+				},
-				IsExplicit: true,
+				{
-				GUID:       "",
+					IsExplicit: true,
-				Rights:     "CXDRAU",
+					GUID:       "",
-				Status:     "CONFIRMED",
+					Rights:     "CXDRAU",
-				Type:       "U",
+					Status:     "CONFIRMED",
-				UgroupID:   "timofey_tkachev_1@decs3o",
+					Type:       "U",
-			},
+					UgroupID:   "second_account@decs3o",
-			{
+				},
-				IsExplicit: true,
-				GUID:       "",
-				Rights:     "CXDRAU",
-				Status:     "CONFIRMED",
-				Type:       "U",
-				UgroupID:   "second_account@decs3o",
 			},
+			CreatedTime: 1676883850,
+			DeletedTime: 1676883899,
+			ID:          132848,
+			Name:        "std_broker",
+			Status:      "DELETED",
+			UpdatedTime: 1676878820,
 		},
-		CreatedTime: 1676883850,
-		DeletedTime: 1676883899,
-		ID:          132848,
-		Name:        "std_broker",
-		Status:      "DELETED",
-		UpdatedTime: 1676878820,
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -100,11 +103,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := accounts.FilterByStatus("CONFIRMED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("Expected 2 elements in slice, found: ", len(actual))
+		t.Fatal("Expected 2 elements in slice, found: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "CONFIRMED" {
 			t.Fatal("expected CONFIRMED, found: ", item.Status)
 		}
@@ -116,7 +119,7 @@ func TestFilterFunc(t *testing.T) {
 		return ia.DeletedTime == 0
 	})
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.DeletedTime != 0 {
 			t.Fatal("Expected DeletedTime = 0, found: ", item.DeletedTime)
 		}
@@ -126,21 +129,21 @@ func TestFilterFunc(t *testing.T) {
 func TestSortingByCreatedTime(t *testing.T) {
 	actual := accounts.SortByCreatedTime(false)
 
-	if actual[0].Name != "std" {
+	if actual.Data[0].Name != "std" {
-		t.Fatal("Expected account std as earliest, found: ", actual[0].Name)
+		t.Fatal("Expected account std as earliest, found: ", actual.Data[0].Name)
 	}
 
 	actual = accounts.SortByCreatedTime(true)
 
-	if actual[0].Name != "std_broker" {
+	if actual.Data[0].Name != "std_broker" {
-		t.Fatal("Expected account std_broker as latest, found: ", actual[0].Name)
+		t.Fatal("Expected account std_broker as latest, found: ", actual.Data[0].Name)
 	}
 }
 
 func TestFilterEmpty(t *testing.T) {
 	actual := accounts.FilterByID(0)
 
-	if len(actual) != 0 {
+	if len(actual.Data) != 0 {
-		t.Fatal("Expected 0 found, actual: ", len(actual))
+		t.Fatal("Expected 0 found, actual: ", len(actual.Data))
 	}
 }

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)
+	res, err := a.GetRaw(ctx, 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)
 	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
@@ -20,13 +20,12 @@ type GetConsumedAccountUnitsRequest struct {
 //   - CU_M: consumed memory in MB
 //   - CU_C: number of cpu cores
 //   - CU_D: consumed vdisk storage in GB
+//   - CU_DM: consumed max vdisk storage in GB
 //   - CU_I: number of public IPs
 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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	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
@@ -26,6 +26,7 @@ type GetConsumedCloudUnitsByTypeRequest struct {
 //   - CU_M: returns consumed memory in MB
 //   - CU_C: returns number of virtual cpu cores
 //   - CU_D: returns consumed virtual disk storage in GB
+//   - CU_DM: returns consumed max virtual disk storage in GB
 //   - CU_S: returns consumed primary storage (NAS) in TB
 //   - CU_A: returns consumed secondary storage (Archive) in TB
 //   - CU_NO: returns sent/received network transfer in operator in GB
@@ -34,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.ValidationErrors(validators.GetErrors(err))
-			return 0, validators.ValidationError(validationError)
-		}
 	}
 
 	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
@@ -21,13 +21,12 @@ type GetReservedAccountUnitsRequest struct {
 //   - CU_M: reserved memory in MB
 //   - CU_C: number of cpu cores
 //   - CU_D: reserved vdisk storage in GB
+//   - CU_DM: reserved max vdisk storage in GB
 //   - CU_I: number of public IPs
 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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/getReservedAccountUnits"

pkg/cloudapi/account/get_resource_consumption.go

@@ -0,0 +1,40 @@
+package account
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetResourceConsumptionRequest struct to get resource consumption
+type GetResourceConsumptionRequest struct {
+	// ID an account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+}
+
+// GetResourceConsumption show amount of consumed and reserved resources (cpu, ram, disk) by specific account
+func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*RecordResourceConsumption, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/getResourceConsumption"
+
+	info := RecordResourceConsumption{}
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}

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,24 +4,45 @@ 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
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by access control list
+	// Required: false
+	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
+
+	// 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"`
+
 	// Page number
 	// Required: false
-	Page uint64 `url:"page" json:"page"`
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
 
 	// Page size
 	// Required: false
-	Size uint64 `url:"size" json:"size"`
+	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) {
+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
 	}
@@ -33,5 +54,18 @@ func (a Account) List(ctx context.Context, req ListRequest) (ListAccounts, error
 		return nil, err
 	}
 
-	return list, nil
+	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,20 +8,63 @@ 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
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by compute id
+	// Required: false
+	ComputeID uint64 `url:"computeId,omitempty" json:"computeId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by resource group name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by tech status
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by ip address
+	// Required: false
+	IPAddress string `url:"ipAddress,omitempty" json:"ipAddress,omitempty"`
+
+	// Find by external network name
+	// Required: false
+	ExtNetName string `url:"extNetName,omitempty" json:"extNetName,omitempty"`
+
+	// Find by external network id
+	// 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"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // ListComputes gets list all compute instances under specified account, accessible by the user
-func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (ListComputes, error) {
+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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/listComputes"
@@ -38,5 +81,5 @@ func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (Lis
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_deleted.go

@@ -4,21 +4,45 @@ 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
-	Page uint64 `url:"page" json:"page"`
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
 
 	// Page size
 	// Required: false
-	Size uint64 `url:"size" json:"size"`
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// 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) {
+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)
@@ -33,5 +57,5 @@ func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListA
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_disks.go

@@ -8,20 +8,47 @@ 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
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by disk id
+	// Required: false
+	DiskID uint64 `url:"diskId,omitempty" json:"diskId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize uint64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Type of the disks
+	// 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"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // ListDisks gets list all currently unattached disks under specified account
-func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (ListDisks, error) {
+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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/listDisks"
@@ -38,5 +65,5 @@ func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (ListDisks
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_flipgroups.go

@@ -8,20 +8,55 @@ 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 an account
+	// ID of the account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by vinsId
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
+
+	// Find by VINS name
+	// Required: false
+	VINSName string `url:"vinsName,omitempty" json:"vinsName,omitempty"`
+
+	// Find by external network id
+	// Required: false
+	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`
+
+	// Find by IP
+	// Required: false
+	ByIP string `url:"byIp,omitempty" json:"byIp,omitempty"`
+
+	// Find by flipGroup Id
+	// 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"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // ListFLIPGroups gets list all FLIPGroups under specified account, accessible by the user
-func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (ListFLIPGroups, error) {
+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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/listFlipGroups"
@@ -38,5 +73,5 @@ func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_resource_consumption.go

@@ -0,0 +1,26 @@
+package account
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+)
+
+// ListResourceConsumption show data list amount of consumed and reserved resources (cpu, ram, disk) by specific accounts
+func (a Account) ListResourceConsumption(ctx context.Context) (*ListResourceConsumption, error) {
+	url := "/cloudapi/account/listResourceConsumption"
+
+	info := ListResourceConsumption{}
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}

pkg/cloudapi/account/list_rg.go

@@ -8,20 +8,51 @@ 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
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// 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:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by vinsId
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
+
+	// Find by VM ID
+	// Required: false
+	VMID uint64 `url:"vmId,omitempty" json:"vmId,omitempty"`
+
+	// 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) {
+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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/listRG"
@@ -38,5 +69,5 @@ func (a Account) ListRG(ctx context.Context, req ListRGRequest) (ListRG, error)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_templates.go

@@ -8,24 +8,47 @@ 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
-    AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// Include deleted images
 	// Required: false
-	IncludeDeleted bool `url:"includedeleted" json:"includedeleted"`
+	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
+
+	// Find by image id
+	// Required: false
+	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by type
+	// 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"`
+
+	// Page size
+	// Required: false
+	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) {
+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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/listTemplates"
@@ -42,5 +65,5 @@ func (a Account) ListTemplates(ctx context.Context, req ListTemplatesRequest) (L
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_vins.go

@@ -8,20 +8,47 @@ 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
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by VINS ID
+	// Required: false
+	VINSID uint64 `url:"vins,omitempty" json:"vinsId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by external network ip
+	// 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"`
+
+	// Page size
+	// Required: false
+	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) {
+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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/listVins"
@@ -38,5 +65,5 @@ func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, e
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/models.go

@@ -32,6 +32,9 @@ type ResourceLimits struct {
 	// Disk size, GB
 	CUD float64 `json:"CU_D"`
 
+	// Max disk size, GB
+	CUDM float64 `json:"CU_DM"`
+
 	// Number of public IP addresses
 	CUI float64 `json:"CU_I"`
 
@@ -50,12 +53,18 @@ type ItemAccount struct {
 	// Access Control List
 	ACL []RecordACL `json:"acl"`
 
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -70,7 +79,11 @@ type ItemAccount struct {
 }
 
 // List of accounts
-type ListAccounts []ItemAccount
+type ListAccounts struct {
+	Data []ItemAccount `json:"data"`
+
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Resources used
 type Resource struct {
@@ -81,7 +94,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"`
@@ -105,16 +118,33 @@ type DiskUsage struct {
 	DiskSize float64 `json:"disksize"`
 
 	// Disk size max
-	DiskSizeMax uint64 `json:"disksizemax"`
+	DiskSizeMax float64 `json:"disksizemax"`
+}
+
+// Information about resource consumption
+type RecordResourceConsumption struct {
+	ItemResourceConsumption
+
+	// Resource limits
+	ResourceLimits ResourceLimits `json:"resourceLimits"`
 }
 
 // Information about resources
-type Resources struct {
+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"`
+}
+
+type ListResourceConsumption struct {
+	Data []ItemResourceConsumption `json:"data"`
+
+	EntryCount uint64 `json:"entryCount"`
 }
 
 // Information about computes
@@ -135,14 +165,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"`
 
-	// Resources
-	Resources Resources `json:"Resources"`
-
 	// CKey
 	CKey string `json:"_ckey"`
 
@@ -155,17 +191,29 @@ type RecordAccount struct {
 	// Company URL
 	CompanyURL string `json:"companyurl"`
 
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
+
 	// Computes
 	Computes Computes `json:"computes"`
 
+	// CPU allocation parameter
+	CPUAllocationParameter string `json:"cpu_allocation_parameter"`
+
+	// CPU allocation ratio
+	CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
+
 	// Created by
 	CreatedBy string `json:"createdBy"`
 
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Deactivation time
-	DeactivationTime uint64 `json:"deactivationTime"`
+	DeactivationTime float64 `json:"deactivationTime"`
 
 	// Deleted by
 	DeletedBy string `json:"deletedBy"`
@@ -192,7 +240,7 @@ type RecordAccount struct {
 	ResourceLimits ResourceLimits `json:"resourceLimits"`
 
 	// Resource types
-	ResourceTypes []string `json:"resourceTypes"`
+	ResTypes []string `json:"resourceTypes"`
 
 	// Send access emails
 	SendAccessEmails bool `json:"sendAccessEmails"`
@@ -214,6 +262,12 @@ type RecordAccount struct {
 
 	// VINSes
 	VINSes uint64 `json:"vinses"`
+
+	// Zone
+	ZoneIDs []ZoneID
+
+	// Zones
+	DefaultZoneID uint64 `json:"defaultZoneId"`
 }
 
 // Main information about compute
@@ -280,7 +334,13 @@ type ItemCompute struct {
 }
 
 // List of computes
-type ListComputes []ItemCompute
+type ListComputes struct {
+	// Data
+	Data []ItemCompute `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about disk
 type ItemDisk struct {
@@ -307,7 +367,13 @@ type ItemDisk struct {
 }
 
 // List of disks
-type ListDisks []ItemDisk
+type ListDisks struct {
+	// Data
+	Data []ItemDisk `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about VINS
 type ItemVINS struct {
@@ -335,6 +401,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"`
 
@@ -364,7 +436,13 @@ type ItemVINS struct {
 }
 
 // List of VINS
-type ListVINS []ItemVINS
+type ListVINS struct {
+	// Data
+	Data []ItemVINS `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main info about audit
 type ItemAudit struct {
@@ -455,6 +533,9 @@ type ItemRG struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Resource group ID
 	RGID uint64 `json:"id"`
 
@@ -478,7 +559,13 @@ type ItemRG struct {
 }
 
 // List of Resource groups
-type ListRG []ItemRG
+type ListRG struct {
+	// Data
+	Data []ItemRG `json:"data"`
+
+	// Enrtry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about template
 type ItemTemplate struct {
@@ -514,7 +601,13 @@ type ItemTemplate struct {
 }
 
 // List of templates
-type ListTemplates []ItemTemplate
+type ListTemplates struct {
+	// Data
+	Data []ItemTemplate `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about FLIPGroup
 type ItemFLIPGroup struct {
@@ -583,4 +676,10 @@ type ItemFLIPGroup struct {
 }
 
 // List of FLIPGroups
-type ListFLIPGroups []ItemFLIPGroup
+type ListFLIPGroups struct {
+	// Data
+	Data []ItemFLIPGroup `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/account/restore.go

@@ -3,12 +3,11 @@ package account
 import (
 	"context"
 	"net/http"
-	"strconv"
 
 	"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
@@ -16,25 +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 "", validators.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/account/restore"
 
-	res, 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
 	}
 
-	result, err := strconv.ParseBool(string(res))
+	return string(result), nil
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
 }

pkg/cloudapi/account/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (la ListAccounts) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(la) == 0 {
+	if len(la.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudapi/account/sorting.go

@@ -6,16 +6,16 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByCreatedTime(inverse bool) ListAccounts {
-	if len(la) < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
-	sort.Slice(la, func(i, j int) bool {
+	sort.Slice(la.Data, func(i, j int) bool {
 		if inverse {
-			return la[i].CreatedTime > la[j].CreatedTime
+			return la.Data[i].CreatedTime > la.Data[j].CreatedTime
 		}
 
-		return la[i].CreatedTime < la[j].CreatedTime
+		return la.Data[i].CreatedTime < la.Data[j].CreatedTime
 	})
 
 	return la
@@ -25,16 +25,16 @@ func (la ListAccounts) SortByCreatedTime(inverse bool) ListAccounts {
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByUpdatedTime(inverse bool) ListAccounts {
-	if len(la) < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
-	sort.Slice(la, func(i, j int) bool {
+	sort.Slice(la.Data, func(i, j int) bool {
 		if inverse {
-			return la[i].UpdatedTime > la[j].UpdatedTime
+			return la.Data[i].UpdatedTime > la.Data[j].UpdatedTime
 		}
 
-		return la[i].UpdatedTime < la[j].UpdatedTime
+		return la.Data[i].UpdatedTime < la.Data[j].UpdatedTime
 	})
 
 	return la
@@ -44,16 +44,16 @@ func (la ListAccounts) SortByUpdatedTime(inverse bool) ListAccounts {
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByDeletedTime(inverse bool) ListAccounts {
-	if len(la) < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
-	sort.Slice(la, func(i, j int) bool {
+	sort.Slice(la.Data, func(i, j int) bool {
 		if inverse {
-			return la[i].DeletedTime > la[j].DeletedTime
+			return la.Data[i].DeletedTime > la.Data[j].DeletedTime
 		}
 
-		return la[i].DeletedTime < la[j].DeletedTime
+		return la.Data[i].DeletedTime < la.Data[j].DeletedTime
 	})
 
 	return la

pkg/cloudapi/account/update.go

@@ -8,52 +8,63 @@ 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"`
 
 	// Max size of memory in MB
 	// Required: false
-	MaxMemoryCapacity uint64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
+	MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
 
 	// Max size of aggregated vdisks in GB
 	// Required: false
-	MaxVDiskCapacity uint64 `url:"maxVDiskCapacity,omitempty" json:"maxVDiskCapacity,omitempty"`
+	MaxVDiskCapacity int64 `url:"maxVDiskCapacity,omitempty" json:"maxVDiskCapacity,omitempty"`
 
 	// Max number of CPU cores
 	// Required: false
-	MaxCPUCapacity uint64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
+	MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
 
 	// Max sent/received network transfer peering
 	// Required: false
-	MaxNetworkPeerTransfer uint64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
+	MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
 
 	// Max number of assigned public IPs
 	// Required: false
-	MaxNumPublicIP uint64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`
+	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,omitempty" json:"sendAccessEmails,omitempty"`
+	SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"`
 
 	// Limit (positive) or disable (0) GPU resources
 	// Required: false
-	GPUUnits uint64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
+	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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
@@ -23,16 +23,14 @@ type UpdateUserRequest struct {
 	//	- 'RCX' for Write
 	//	- 'ARCXDU' for Admin
 	// Required: true
-	AccessType string `url:"accesstype" json:"accesstype" validate:"required,accountAccessType"`
+	AccessType string `url:"accesstype" json:"accesstype" validate:"required,accessType"`
 }
 
 // UpdateUser updates user access rights
 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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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/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/models.go

@@ -0,0 +1,41 @@
+package audit
+
+// Main info about audit
+type RecordAudit struct {
+
+	// Arguments
+	Arguments string `json:"args"`
+
+	// Call
+	Call string `json:"call"`
+
+	// GUID
+	GUID string `json:"guid"`
+
+	// 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"`
+}

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.ValidationErrors(validators.GetErrors(err))
-			return 0, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
-	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/bservice/enable"

pkg/cloudapi/bservice/filter.go

@@ -49,21 +49,23 @@ func (lbs ListBasicServices) FilterByTechStatus(techStatus string) ListBasicServ
 func (lbs ListBasicServices) FilterFunc(predicate func(ItemBasicService) bool) ListBasicServices {
 	var result ListBasicServices
 
-	for _, item := range lbs {
+	for _, item := range lbs.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(lbs.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemBasicService
 // If none was found, returns an empty struct.
 func (lbs ListBasicServices) FindOne() ItemBasicService {
-	if len(lbs) == 0 {
+	if lbs.EntryCount == 0 {
 		return ItemBasicService{}
 	}
 
-	return lbs[0]
+	return lbs.Data[0]
 }

pkg/cloudapi/bservice/filter_test.go

@@ -3,78 +3,81 @@ package bservice
 import "testing"
 
 var bservices = ListBasicServices{
-	{
+	Data: []ItemBasicService{
-		AccountID:     1,
+		{
-		AccountName:   "std_1",
+			AccountID:     1,
-		BaseDomain:    "",
+			AccountName:   "std_1",
-		CreatedBy:     "sample_user_1@decs3o",
+			BaseDomain:    "",
-		CreatedTime:   1677743675,
+			CreatedBy:     "sample_user_1@decs3o",
-		DeletedBy:     "",
+			CreatedTime:   1677743675,
-		DeletedTime:   0,
+			DeletedBy:     "",
-		GID:           212,
+			DeletedTime:   0,
-		Groups:        []uint64{},
+			GID:           212,
-		GUID:          1,
+			Groups:        []uint64{},
-		ID:            1,
+			GUID:          1,
-		Name:          "bservice_1",
+			ID:            1,
-		ParentSrvID:   0,
+			Name:          "bservice_1",
-		ParentSrvType: "",
+			ParentSrvID:   0,
-		RGID:          7971,
+			ParentSrvType: "",
-		RGName:        "rg_1",
+			RGID:          7971,
-		SSHUser:       "",
+			RGName:        "rg_1",
-		Status:        "CREATED",
+			SSHUser:       "",
-		TechStatus:    "STOPPED",
+			Status:        "CREATED",
-		UpdatedBy:     "",
+			TechStatus:    "STOPPED",
-		UpdatedTime:   0,
+			UpdatedBy:     "",
-		UserManaged:   true,
+			UpdatedTime:   0,
-	},
+			UserManaged:   true,
-	{
+		},
-		AccountID:     2,
+		{
-		AccountName:   "std_2",
+			AccountID:     2,
-		BaseDomain:    "",
+			AccountName:   "std_2",
-		CreatedBy:     "sample_user_1@decs3o",
+			BaseDomain:    "",
-		CreatedTime:   1677743736,
+			CreatedBy:     "sample_user_1@decs3o",
-		DeletedBy:     "",
+			CreatedTime:   1677743736,
-		DeletedTime:   0,
+			DeletedBy:     "",
-		GID:           212,
+			DeletedTime:   0,
-		Groups:        []uint64{},
+			GID:           212,
-		GUID:          2,
+			Groups:        []uint64{},
-		ID:            2,
+			GUID:          2,
-		Name:          "bservice_2",
+			ID:            2,
-		ParentSrvID:   0,
+			Name:          "bservice_2",
-		ParentSrvType: "",
+			ParentSrvID:   0,
-		RGID:          7972,
+			ParentSrvType: "",
-		RGName:        "rg_2",
+			RGID:          7972,
-		SSHUser:       "",
+			RGName:        "rg_2",
-		Status:        "CREATED",
+			SSHUser:       "",
-		TechStatus:    "STOPPED",
+			Status:        "CREATED",
-		UpdatedBy:     "",
+			TechStatus:    "STOPPED",
-		UpdatedTime:   0,
+			UpdatedBy:     "",
-		UserManaged:   true,
+			UpdatedTime:   0,
-	},
+			UserManaged:   true,
-	{
+		},
-		AccountID:     3,
+		{
-		AccountName:   "std_3",
+			AccountID:     3,
-		BaseDomain:    "",
+			AccountName:   "std_3",
-		CreatedBy:     "sample_user_2@decs3o",
+			BaseDomain:    "",
-		CreatedTime:   1677743830,
+			CreatedBy:     "sample_user_2@decs3o",
-		DeletedBy:     "",
+			CreatedTime:   1677743830,
-		DeletedTime:   0,
+			DeletedBy:     "",
-		GID:           212,
+			DeletedTime:   0,
-		Groups:        []uint64{},
+			GID:           212,
-		GUID:          3,
+			Groups:        []uint64{},
-		ID:            3,
+			GUID:          3,
-		Name:          "bservice_3",
+			ID:            3,
-		ParentSrvID:   0,
+			Name:          "bservice_3",
-		ParentSrvType: "",
+			ParentSrvID:   0,
-		RGID:          7973,
+			ParentSrvType: "",
-		RGName:        "rg_3",
+			RGID:          7973,
-		SSHUser:       "",
+			RGName:        "rg_3",
-		Status:        "ENABLED",
+			SSHUser:       "",
-		TechStatus:    "STARTED",
+			Status:        "ENABLED",
-		UpdatedBy:     "",
+			TechStatus:    "STARTED",
-		UpdatedTime:   0,
+			UpdatedBy:     "",
-		UserManaged:   true,
+			UpdatedTime:   0,
+			UserManaged:   true,
+		},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -104,11 +107,11 @@ func TestFilterByRGID(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := bservices.FilterByStatus("CREATED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "CREATED" {
 			t.Fatal("expected Status 'CREATED', found: ", item.Status)
 		}
@@ -118,11 +121,11 @@ func TestFilterByStatus(t *testing.T) {
 func TestFilterByTechStatus(t *testing.T) {
 	actual := bservices.FilterByTechStatus("STOPPED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.TechStatus != "STOPPED" {
 			t.Fatal("expected TechStatus 'STOPPED', found: ", item.TechStatus)
 		}
@@ -134,8 +137,8 @@ func TestFilterFunc(t *testing.T) {
 		return ibs.CreatedBy == "sample_user_2@decs3o"
 	})
 
-	if len(actual) > 1 {
+	if len(actual.Data) > 1 {
-		t.Fatal("expected 1 found, actual: ", len(actual))
+		t.Fatal("expected 1 found, actual: ", len(actual.Data))
 	}
 
 	if actual.FindOne().CreatedBy != "sample_user_2@decs3o" {
@@ -146,7 +149,7 @@ func TestFilterFunc(t *testing.T) {
 func TestSortByCreatedTime(t *testing.T) {
 	actual := bservices.SortByCreatedTime(true)
 
-	if actual[0].CreatedTime != 1677743830 || actual[2].CreatedTime != 1677743675 {
+	if actual.Data[0].CreatedTime != 1677743830 || actual.Data[2].CreatedTime != 1677743675 {
 		t.Fatal("expected descending order, found ascending")
 	}
 }

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)
+	res, err := b.GetRaw(ctx, 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)
 	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,41 @@ 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
 	// Required: true
-    Driver string `url:"driver" json:"driver" validate:"bserviceDriver"`
+	Driver string `url:"driver" json:"driver" validate:"driver"`
 
 	// Storage endpoint provider ID
 	// Required: false
@@ -68,6 +67,24 @@ 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"`
+}
+
+// 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 +93,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.ValidationErrors(validators.GetErrors(err))
-			return 0, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	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
+// GroupParentAddRequest struct to add parent Compute Group relation to the specified 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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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
+// GroupParentRemoveRequest struct to remove parent Compute Group
-// relation to the specified 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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return 0, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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,18 +4,48 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list/deleted list BasicService instances
+// ListRequest struct to get list of BasicService instances
 type ListRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
 	// ID of the account to query for BasicService instances
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
+	// Find by resource group name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,omitempty"`
+
 	// ID of the resource group to query for BasicService instances
 	// Required: false
 	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
 
+	// Find by tech status
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by account name
+	// 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"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -25,40 +55,33 @@ 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) {
+func (b BService) List(ctx context.Context, req ListRequest) (*ListBasicServices, error) {
+
+	res, err := b.ListRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListBasicServices{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	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)
-	if err != nil {
+	return res, err
-		return nil, err
-	}
-
-	list := ListBasicServices{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return list, nil
-}
-
-// ListDeleted gets list deleted BasicService instances associated with the specified Resource Group
-func (b BService) ListDeleted(ctx context.Context, req ListRequest) (ListBasicServices, error) {
-	url := "/cloudapi/bservice/listDeleted"
-
-	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListBasicServices{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return list, nil
 }

pkg/cloudapi/bservice/list_deleted.go

@@ -0,0 +1,56 @@
+package bservice
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ListDeletedRequest struct to get list of deleted BasicService instances
+type ListDeletedRequest struct {
+	// ID of the account to query for BasicService instances
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// ID of the resource group to query for BasicService instances
+	// 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"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+}
+
+// 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)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListBasicServices{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}

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

@@ -35,11 +35,8 @@ type RecordBasicService struct {
 	// Grid ID
 	GID uint64 `json:"gid"`
 
-	// List of Service Compute Group IDs
+	// List of Service Compute Groups
-	Groups []uint64 `json:"groups"`
+	Groups ListGroups `json:"groups"`
-
-	// List of compute groups by name
-	GroupsName []string `json:"groupsName"`
 
 	// GUID
 	GUID uint64 `json:"guid"`
@@ -91,10 +88,19 @@ 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 `json:"accountId"`
+
+	// Architecture
+	Architecture string `json:"arch"`
+
 	// Compute group ID
 	CompGroupID uint64 `json:"compgroupId"`
 
@@ -109,11 +115,47 @@ type ItemCompute struct {
 
 	// Name
 	Name string `json:"name"`
+
+	// Resource group ID
+	RGID uint64 `json:"rgId"`
+
+	// StackID
+	StackID uint64 `json:"stackId"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Tech status
+	TechStatus string `json:"techStatus"`
 }
 
 // List of Computes
 type ListComputes []ItemCompute
 
+// Main information about Group
+type ItemGroup struct {
+	// Amount of computes
+	Computes uint64 `json:"computes"`
+
+	// Consistency
+	Consistency bool `json:"consistency"`
+
+	// Group ID
+	ID uint64 `json:"id"`
+
+	// Group name
+	Name string `json:"name"`
+
+	// Status
+	Status string `json:"status"`
+
+	// TechStatus
+	TechStatus string `json:"techStatus"`
+}
+
+// List of Groups
+type ListGroups []ItemGroup
+
 // Main information about Snapshot
 type ItemSnapshot struct {
 	// GUID
@@ -129,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
@@ -247,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
@@ -331,7 +385,14 @@ type ItemBasicService struct {
 
 	// User Managed or not
 	UserManaged bool `json:"userManaged"`
+
+	// Zone ID
+	ZoneID uint64 `json:"zoneId"`
 }
 
 // List of BasicServices
-type ListBasicServices []ItemBasicService
+type ListBasicServices struct {
+	Data []ItemBasicService `json:"data"`
+
+	EntryCount uint64 `json:"entryCount"`
+}

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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/bservice/restore"

pkg/cloudapi/bservice/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (lbs ListBasicServices) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(lbs) == 0 {
+	if lbs.EntryCount == 0 {
 		return []byte{}, nil
 	}
 

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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return nil, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/bservice/snapshotRollback"

pkg/cloudapi/bservice/sorting.go

@@ -6,16 +6,16 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (lbs ListBasicServices) SortByCreatedTime(inverse bool) ListBasicServices {
-	if len(lbs) < 2 {
+	if lbs.EntryCount < 2 {
 		return lbs
 	}
 
-	sort.Slice(lbs, func(i, j int) bool {
+	sort.Slice(lbs.Data, func(i, j int) bool {
 		if inverse {
-			return lbs[i].CreatedTime > lbs[j].CreatedTime
+			return lbs.Data[i].CreatedTime > lbs.Data[j].CreatedTime
 		}
 
-		return lbs[i].CreatedTime < lbs[j].CreatedTime
+		return lbs.Data[i].CreatedTime < lbs.Data[j].CreatedTime
 	})
 
 	return lbs
@@ -25,16 +25,16 @@ func (lbs ListBasicServices) SortByCreatedTime(inverse bool) ListBasicServices {
 //
 // If inverse param is set to true, the order is reversed.
 func (lbs ListBasicServices) SortByUpdatedTime(inverse bool) ListBasicServices {
-	if len(lbs) < 2 {
+	if lbs.EntryCount < 2 {
 		return lbs
 	}
 
-	sort.Slice(lbs, func(i, j int) bool {
+	sort.Slice(lbs.Data, func(i, j int) bool {
 		if inverse {
-			return lbs[i].UpdatedTime > lbs[j].UpdatedTime
+			return lbs.Data[i].UpdatedTime > lbs.Data[j].UpdatedTime
 		}
 
-		return lbs[i].UpdatedTime < lbs[j].UpdatedTime
+		return lbs.Data[i].UpdatedTime < lbs.Data[j].UpdatedTime
 	})
 
 	return lbs
@@ -44,16 +44,16 @@ func (lbs ListBasicServices) SortByUpdatedTime(inverse bool) ListBasicServices {
 //
 // If inverse param is set to true, the order is reversed.
 func (lbs ListBasicServices) SortByDeletedTime(inverse bool) ListBasicServices {
-	if len(lbs) < 2 {
+	if lbs.EntryCount < 2 {
 		return lbs
 	}
 
-	sort.Slice(lbs, func(i, j int) bool {
+	sort.Slice(lbs.Data, func(i, j int) bool {
 		if inverse {
-			return lbs[i].DeletedTime > lbs[j].DeletedTime
+			return lbs.Data[i].DeletedTime > lbs.Data[j].DeletedTime
 		}
 
-		return lbs[i].DeletedTime < lbs[j].DeletedTime
+		return lbs.Data[i].DeletedTime < lbs.Data[j].DeletedTime
 	})
 
 	return lbs

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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return "", validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	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.ValidationErrors(validators.GetErrors(err))
-			return false, validators.ValidationError(validationError)
-		}
 	}
 
 	url := "/cloudapi/compute/affinityLabelSet"