1.7.0-pre-alfa

.gitignore

@@ -3,8 +3,3 @@ cmd/
 .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,40 +1,7 @@
-## Version 1.10.1
+## Version 1.6.5
-
-### Добавлено
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-268 | Вычисляемое поле `PreferredCPU` в моделях `RecordCompute, ItemCompute, InfoCompute` в cloudapi/compute и cloudbroker/compute |
-| BGOS-268 | Опциональное поле `PreferredCPU` в структурах `ResizeRequest, UpdateRequest` в cloudapi/compute и cloudbroker/compute |
-
-#### kvmx86
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-268 | Опциональное поле `PreferredCPU` в структурах `CreateRequest, CreateBlankRequest` в cloudapi/kvmx86 и cloudbroker/kvmx86 |
-
-#### node
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-270 | Вычисляемые поля `DPDK, UEFIFirmwareFile` в модели `ItemNode` в cloudbroker/node |
-| BGOS-271 | Вычисляемые поля `DPDK, NetworkMode, ToActive, ToInstalling, ToMaintenance, ToRestricted` в моделях `RecordNode` в cloudbroker/node |
-
-#### sep
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-273 | Вычисляемое поле `MultipathNum` в модели `RecordSEP` cloudbroker/sep |
-
-#### vins
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-265 | Вычисляемое поле `AccoundID` в модели `ItemReservation` в cloudbroker/vins |
-
-### Удалено
-
-#### sep
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-272 | Вычисляемые поля `_ckey,_meta` в модели `RecordSEP` в cloudbroker/sep |
-
-
 
+## Feature
+- Add field and type LibvirtDaemon in model Packages in cloudbroker/stack/models    
+- Add field and type Packages in model ItemListStacks in cloudbroker/image/models. Add fields and type LibvirtBin, LibvirtDaemon, Lvm2Lockd, OpenvswitchCommon, OpenvswitchSwitch, QemuSystemX86, Sanlock
+- Add filter ByGID in cloudbroker/grid/filters
+- Add field userData in models WorkersGroupAddRequest in cloudapi/k8s and cloudbroker/k8s

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 2022 Basis LTD
+Copyright [yyyy] [name of copyright owner]
 
 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

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

client.go

@@ -4,26 +4,25 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"mime/multipart"
 	"net/http"
-	"reflect"
 	"strconv"
 	"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/internal/validators"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
+	k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
+	k8s_cb"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
+	"github.com/google/go-querystring/query"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
 )
 
-// DecortClient is HTTP-client for platform
+// HTTP-client for platform
 type DecortClient struct {
 	decortURL  string
 	client     *http.Client
@@ -54,7 +53,7 @@ func New(cfg config.Config) *DecortClient {
 				},
 			},
 		},
-		cfg:        trimConfig(&cfg),
+		cfg:        cfg,
 		expiryTime: expiryTime,
 		mutex:      &sync.Mutex{},
 	}
@@ -72,77 +71,321 @@ 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) {
+	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
+	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
+
+	if okCa {
+		reqBody := &bytes.Buffer{}
+		writer := multipart.NewWriter(reqBody)
+		if k8sCaCreateReq.OidcCertificate != "" {
+			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
+			_, _ = io.Copy(part, strings.NewReader(k8sCaCreateReq.OidcCertificate))
+		}
 
-	var body *bytes.Buffer
+		_ = writer.WriteField("name", k8sCaCreateReq.Name)
-	var ctype string
+		_ = writer.WriteField("rgId", strconv.FormatUint(k8sCaCreateReq.RGID, 10))
+		_ = writer.WriteField("k8ciId", strconv.FormatUint(k8sCaCreateReq.K8SCIID, 10))
+		_ = writer.WriteField("workerGroupName", k8sCaCreateReq.WorkerGroupName)
+		_ = writer.WriteField("networkPlugin", k8sCaCreateReq.NetworkPlugin)
 
-	byteSlice, ok := params.([]byte)
+		if k8sCaCreateReq.MasterSEPID != 0 {
-	if ok {
+			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCaCreateReq.MasterSEPID, 10))
-		body = bytes.NewBuffer(byteSlice)
+		}
-		// ctype = "application/x-iso9660-image"
+		if k8sCaCreateReq.MasterSEPPool != "" {
-		ctype = "application/octet-stream"
+			_ = writer.WriteField("masterSepPool", k8sCaCreateReq.MasterSEPPool)
-	} else {
+		}
-		values, err := query.Values(params)
+		if k8sCaCreateReq.WorkerSEPID != 0 {
+			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCaCreateReq.WorkerSEPID, 10))
+		}
+		if k8sCaCreateReq.WorkerSEPPool != "" {
+			_ = writer.WriteField("workerSepPool", k8sCaCreateReq.WorkerSEPPool)
+		}
+
+		if k8sCaCreateReq.Labels != nil {
+			for _, v := range k8sCaCreateReq.Labels {
+				_ = writer.WriteField("labels", v)
+			}
+		}
+		if k8sCaCreateReq.Taints != nil {
+			for _, v := range k8sCaCreateReq.Taints {
+				_ = writer.WriteField("taints", v)
+			}
+		}
+		if k8sCaCreateReq.Annotations != nil {
+			for _, v := range k8sCaCreateReq.Annotations {
+				_ = writer.WriteField("annotations", v)
+			}
+		}
+
+		if k8sCaCreateReq.MasterCPU != 0 {
+			_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(k8sCaCreateReq.MasterCPU), 10))
+		}
+		if k8sCaCreateReq.MasterNum != 0 {
+			_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(k8sCaCreateReq.MasterNum), 10))
+		}
+		if k8sCaCreateReq.MasterRAM != 0 {
+			_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(k8sCaCreateReq.MasterRAM), 10))
+		}
+		if k8sCaCreateReq.MasterDisk != 0 {
+			_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(k8sCaCreateReq.MasterDisk), 10))
+		}
+		if k8sCaCreateReq.WorkerCPU != 0 {
+			_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerCPU), 10))
+		}
+		if k8sCaCreateReq.WorkerNum != 0 {
+			_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerNum), 10))
+		}
+		if k8sCaCreateReq.WorkerRAM != 0 {
+			_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerRAM), 10))
+		}
+		if k8sCaCreateReq.WorkerDisk != 0 {
+			_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerDisk), 10))
+		}
+		if k8sCaCreateReq.ExtNetID != 0 {
+			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCaCreateReq.ExtNetID, 10))
+		}
+		if k8sCaCreateReq.VinsId != 0 {
+			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCaCreateReq.VinsId, 10))
+		}
+		if !k8sCaCreateReq.WithLB {
+			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCaCreateReq.WithLB))
+		}
+
+		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCaCreateReq.HighlyAvailable))
+
+		if k8sCaCreateReq.AdditionalSANs != nil {
+			for _, v := range k8sCaCreateReq.AdditionalSANs {
+				_ = writer.WriteField("additionalSANs", v)
+			}
+		}
+		if k8sCaCreateReq.InitConfiguration != "" {
+			_ = writer.WriteField("initConfiguration", k8sCaCreateReq.InitConfiguration)
+		}
+		if k8sCaCreateReq.ClusterConfiguration != "" {
+			_ = writer.WriteField("clusterConfiguration", k8sCaCreateReq.ClusterConfiguration)
+		}
+		if k8sCaCreateReq.KubeletConfiguration != "" {
+			_ = writer.WriteField("kubeletConfiguration", k8sCaCreateReq.KubeletConfiguration)
+		}
+		if k8sCaCreateReq.KubeProxyConfiguration != "" {
+			_ = writer.WriteField("kubeProxyConfiguration", k8sCaCreateReq.KubeProxyConfiguration)
+		}
+		if k8sCaCreateReq.JoinConfiguration != "" {
+			_ = writer.WriteField("joinConfiguration", k8sCaCreateReq.JoinConfiguration)
+		}
+		if k8sCaCreateReq.Description != "" {
+			_ = writer.WriteField("desc", k8sCaCreateReq.Description)
+		}
+		if k8sCaCreateReq.UserData != "" {
+			_ = writer.WriteField("userData", k8sCaCreateReq.UserData)
+		}
+
+		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCaCreateReq.ExtNetOnly))
+		_ = writer.FormDataContentType()
+
+		ct := writer.FormDataContentType()
+
+		writer.Close()
+		req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, reqBody)
 		if err != nil {
 			return nil, err
 		}
-		body = bytes.NewBufferString(values.Encode())
+		if err = dc.getToken(ctx); err != nil {
+			return nil, err
+		}
+
+		resp, err := dc.domp(req, ct)
+		if err != nil {
+			return nil, err
 		}
+		defer resp.Body.Close()
 
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
+		respBytes, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return nil, err
 		}
 
-	// get token
+		if resp.StatusCode != 200 {
+			return nil, errors.New(string(respBytes))
+		}
+
+		return respBytes, nil
+	} else if okCb {
+		reqBody := &bytes.Buffer{}
+		writer := multipart.NewWriter(reqBody)
+		if k8sCbCreateReq.OidcCertificate != "" {
+			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
+			_, _ = io.Copy(part, strings.NewReader(k8sCbCreateReq.OidcCertificate))
+		}
+
+		_ = writer.WriteField("name", k8sCbCreateReq.Name)
+		_ = writer.WriteField("rgId", strconv.FormatUint(k8sCbCreateReq.RGID, 10))
+		_ = writer.WriteField("k8ciId", strconv.FormatUint(k8sCbCreateReq.K8CIID, 10))
+		_ = writer.WriteField("workerGroupName", k8sCbCreateReq.WorkerGroupName)
+		_ = writer.WriteField("networkPlugin", k8sCbCreateReq.NetworkPlugin)
+
+		if k8sCbCreateReq.MasterSEPID != 0 {
+			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCbCreateReq.MasterSEPID, 10))
+		}
+		if k8sCbCreateReq.MasterSEPPool != "" {
+			_ = writer.WriteField("masterSepPool", k8sCbCreateReq.MasterSEPPool)
+		}
+		if k8sCbCreateReq.WorkerSEPID != 0 {
+			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCbCreateReq.WorkerSEPID, 10))
+		}
+		if k8sCbCreateReq.WorkerSEPPool != "" {
+			_ = writer.WriteField("workerSepPool", k8sCbCreateReq.WorkerSEPPool)
+		}
+
+		if k8sCbCreateReq.Labels != nil {
+			for _, v := range k8sCbCreateReq.Labels {
+				_ = writer.WriteField("labels", v)
+			}
+		}
+		if k8sCbCreateReq.Taints != nil {
+			for _, v := range k8sCbCreateReq.Taints {
+				_ = writer.WriteField("taints", v)
+			}
+		}
+		if k8sCbCreateReq.Annotations != nil {
+			for _, v := range k8sCbCreateReq.Annotations {
+				_ = writer.WriteField("annotations", v)
+			}
+		}
+
+		if k8sCbCreateReq.MasterCPU != 0 {
+			_ = writer.WriteField("masterCpu", strconv.FormatUint(k8sCbCreateReq.MasterCPU, 10))
+		}
+		if k8sCbCreateReq.MasterNum != 0 {
+			_ = writer.WriteField("masterNum", strconv.FormatUint(k8sCbCreateReq.MasterNum, 10))
+		}
+		if k8sCbCreateReq.MasterRAM != 0 {
+			_ = writer.WriteField("masterRam", strconv.FormatUint(k8sCbCreateReq.MasterRAM, 10))
+		}
+		if k8sCbCreateReq.MasterDisk != 0 {
+			_ = writer.WriteField("masterDisk", strconv.FormatUint(k8sCbCreateReq.MasterDisk, 10))
+		}
+		if k8sCbCreateReq.WorkerCPU != 0 {
+			_ = writer.WriteField("workerCpu", strconv.FormatUint(k8sCbCreateReq.WorkerCPU, 10))
+		}
+		if k8sCbCreateReq.WorkerNum != 0 {
+			_ = writer.WriteField("workerNum", strconv.FormatUint(k8sCbCreateReq.WorkerNum, 10))
+		}
+		if k8sCbCreateReq.WorkerRAM != 0 {
+			_ = writer.WriteField("workerRam", strconv.FormatUint(k8sCbCreateReq.WorkerRAM, 10))
+		}
+		if k8sCbCreateReq.WorkerDisk != 0 {
+			_ = writer.WriteField("workerDisk", strconv.FormatUint(k8sCbCreateReq.WorkerDisk, 10))
+		}
+		if k8sCbCreateReq.ExtNetID != 0 {
+			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCbCreateReq.ExtNetID, 10))
+		}
+		if k8sCbCreateReq.VinsId != 0 {
+			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCbCreateReq.VinsId, 10))
+		}
+		if !k8sCbCreateReq.WithLB {
+			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCbCreateReq.WithLB))
+		}
+
+		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCbCreateReq.HighlyAvailable))
+
+		if k8sCbCreateReq.AdditionalSANs != nil {
+			for _, v := range k8sCbCreateReq.AdditionalSANs {
+				_ = writer.WriteField("additionalSANs", v)
+			}
+		}
+		if k8sCbCreateReq.InitConfiguration != "" {
+			_ = writer.WriteField("initConfiguration", k8sCbCreateReq.InitConfiguration)
+		}
+		if k8sCbCreateReq.ClusterConfiguration != "" {
+			_ = writer.WriteField("clusterConfiguration", k8sCbCreateReq.ClusterConfiguration)
+		}
+		if k8sCbCreateReq.KubeletConfiguration != "" {
+			_ = writer.WriteField("kubeletConfiguration", k8sCbCreateReq.KubeletConfiguration)
+		}
+		if k8sCbCreateReq.KubeProxyConfiguration != "" {
+			_ = writer.WriteField("kubeProxyConfiguration", k8sCbCreateReq.KubeProxyConfiguration)
+		}
+		if k8sCbCreateReq.JoinConfiguration != "" {
+			_ = writer.WriteField("joinConfiguration", k8sCbCreateReq.JoinConfiguration)
+		}
+		if k8sCbCreateReq.Description != "" {
+			_ = writer.WriteField("desc", k8sCbCreateReq.Description)
+		}
+		if k8sCbCreateReq.UserData != "" {
+			_ = writer.WriteField("userData", k8sCbCreateReq.UserData)
+		}
+
+		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCbCreateReq.ExtNetOnly))
+		_ = writer.FormDataContentType()
+
+		ct := writer.FormDataContentType()
+
+		writer.Close()
+		req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, reqBody)
+		if err != nil {
+			return nil, err
+		}
 		if err = dc.getToken(ctx); err != nil {
 			return nil, err
 		}
-	// perform request
+
-	respBytes, err := dc.do(req, ctype)
+		resp, err := dc.domp(req, ct)
+		if err != nil {
+			return nil, err
+		}
+		defer resp.Body.Close()
+
+		respBytes, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return nil, err
 		}
 
-	return respBytes, err
+		if resp.StatusCode != 200 {
-}
+			return nil, errors.New(string(respBytes))
+		}
 
-// DecortApiCallMP method for sending requests to the platform
+		return respBytes, nil
-func (dc *DecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+	}
-	body, ctype, err := multiPartReq(params)
+
+	values, err := query.Values(params)
 	if err != nil {
 		return nil, err
 	}
 
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
+	body := strings.NewReader(values.Encode())
+	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, body)
 	if err != nil {
 		return nil, err
 	}
 
-	// get token
 	if err = dc.getToken(ctx); err != nil {
 		return nil, err
 	}
 
-	// perform request
+	resp, err := dc.do(req)
-	respBytes, err := dc.do(req, ctype)
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
-	return respBytes, err
+	respBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode != 200 {
+		return nil, errors.New(string(respBytes))
+	}
+
+	return respBytes, nil
 }
 
 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) {
-	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)
 
@@ -151,227 +394,77 @@ func (dc *DecortClient) getToken(ctx context.Context) error {
 		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 || resp == nil {
-		return fmt.Errorf("cannot get token: %w", err)
-	}
-	defer resp.Body.Close()
-
-	var tokenBytes []byte
-	tokenBytes, err = io.ReadAll(resp.Body)
 		if err != nil {
 			return fmt.Errorf("cannot get token: %w", err)
 		}
 
+		tokenBytes, _ := io.ReadAll(resp.Body)
+		resp.Body.Close()
+
 		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.
+func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
-// 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)
+	// var resp *http.Response
-	if err != nil {
+	// var err error
-		return nil, err
+	buf, _ := io.ReadAll(req.Body)
-	}
+	// req = req.Clone(req.Context())
 
-	req.Body.Close()
+	// for i := uint64(0); i < dc.cfg.Retries; i++ {
 	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 	resp, err := dc.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 < 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
+		return resp, err
 	}
-
+	respBytes, _ := io.ReadAll(resp.Body)
-	// handle errors with status code other than 200
 	err = fmt.Errorf("%s", respBytes)
+	resp.Body.Close()
+	// }
+	// }
+
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
 
-// isConnectionError checks if given error falls within specific and associated connection errors
+func (dc *DecortClient) domp(req *http.Request, ctype string) (*http.Response, error) {
-//func isConnectionError(err error) bool {
+	req.Header.Add("Content-Type", ctype)
-//	if strings.Contains(err.Error(), "connection reset by peer") {
+	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
-//		return true
+	req.Header.Set("Accept", "application/json")
-//	}
-//	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 {
+	// var resp *http.Response
-			part, err := writer.CreateFormFile(trimString(types.Field(i)), file)
+	// var err error
-			if err != nil {
+	buf, _ := io.ReadAll(req.Body)
-				return &bytes.Buffer{}, "", err
+	// req = req.Clone(req.Context())
-			}
-			_, 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 {
+	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-			switch slice := values.Field(i).Interface().(type) {
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-			case []string:
+	resp, err := dc.client.Do(req)
-				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 {
+	// if err == nil {
-	switch str := a.(type) {
+	if resp.StatusCode == 200 {
-	case string:
+		return resp, err
-		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 ""
 	}
-}
+	respBytes, _ := io.ReadAll(resp.Body)
-
+	err = fmt.Errorf("%s", respBytes)
-func trimString(el reflect.StructField) string {
+	resp.Body.Close()
-	return strings.TrimSuffix(el.Tag.Get("url"), ",omitempty")
+	// }
-}
+	// }
 
-func trimConfig(cfg *config.Config) config.Config {
+	return nil, fmt.Errorf("could not execute request: %w", err)
-	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
-	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
-	return *cfg
 }

client_bvs.go

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

@@ -72,7 +72,9 @@ func ParseConfigJSON(path string) (Config, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		return Config{}, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return Config{}, validators.ValidationError(validationError)
+		}
 	}
 
 	return config, nil
@@ -94,7 +96,9 @@ func ParseConfigYAML(path string) (Config, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		return Config{}, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return Config{}, validators.ValidationError(validationError)
+		}
 	}
 
 	return config, nil

config/config_bvs.go

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

@@ -66,7 +66,9 @@ func ParseLegacyConfigJSON(path string) (LegacyConfig, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		return LegacyConfig{}, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return LegacyConfig{}, validators.ValidationError(validationError)
+		}
 	}
 
 	return config, nil
@@ -88,7 +90,9 @@ func ParseLegacyConfigYAML(path string) (LegacyConfig, error) {
 
 	err = validators.ValidateConfig(config)
 	if err != nil {
-		return LegacyConfig{}, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return LegacyConfig{}, validators.ValidationError(validationError)
+		}
 	}
 
 	return config, nil

config/timeouts.go

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

config/universal-config.go

@@ -1,8 +0,0 @@
-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,17 +5,15 @@ 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.15.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
 )

go.sum

@@ -8,13 +8,10 @@ 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=
@@ -26,12 +23,12 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

interfaces/caller.go

@@ -6,7 +6,4 @@ 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

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

internal/constants/constants.go

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

internal/multierror/join.go

@@ -1,41 +0,0 @@
-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,37 +1,31 @@
 package validators
 
 import (
-	"errors"
-	"fmt"
-	"net/url"
-	"reflect"
 	"regexp"
 	"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.
+// computeDriverValidator is used to validate Driver field in kvmx86/kvmppc create.
 func computeDriverValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeDriverValues)
+	return StringInSlice(fieldValue, computeDriverValues)
 }
 
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, protoValues)
+	return StringInSlice(fieldValue, protoValues)
 }
 
 // accessTypeValidator is used to validate AccessType fields.
 func accessTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, accessTypeValues)
+	return StringInSlice(fieldValue, accessTypeValues)
 }
 
 // resTypesValidator is used to validate ResTypes fields.
@@ -42,7 +36,7 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !IsInSlice(value, resTypesValues) {
+		if !StringInSlice(value, resTypesValues) {
 			return false
 		}
 	}
@@ -54,63 +48,56 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 func driverValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, driverValues)
+	return StringInSlice(fieldValue, driverValues)
 }
 
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, accountCUTypeValues)
+	return StringInSlice(fieldValue, accountCUTypeValues)
 }
 
 // bserviceModeValidator is used to validate Mode field.
 func bserviceModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, bserviceModeValues)
+	return StringInSlice(fieldValue, bserviceModeValues)
 }
 
 // computeTopologyValidator is used to validate Topology field.
 func computeTopologyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeTopologyValues)
+	return StringInSlice(fieldValue, computeTopologyValues)
 }
 
 // computePolicyValidator is used to validate Policy field.
 func computePolicyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computePolicyValues)
+	return StringInSlice(fieldValue, computePolicyValues)
 }
 
 // computeModeValidator is used to validate Mode field.
 func computeModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeModeValues)
+	return StringInSlice(fieldValue, computeModeValues)
 }
 
 // computeDiskTypeValidator is used to validate DiskType field.
 func computeDiskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeDiskTypeValues)
+	return StringInSlice(fieldValue, computeDiskTypeValues)
 }
 
 // computeNetTypeValidator is used to validate NetType field.
 func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeNetTypeValues)
+	return StringInSlice(fieldValue, computeNetTypeValues)
-}
-
-// computex86NetTypeValidator is used to validate NetType field.
-func computex86NetTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, computex86NetTypeValues)
 }
 
 // computeOrderValidator is used to validate Order field.
@@ -121,7 +108,7 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !IsInSlice(value, computeOrderValues) {
+		if !StringInSlice(value, computeOrderValues) {
 			return false
 		}
 	}
@@ -133,70 +120,70 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 func computeDataDisksValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeDataDisksValues)
+	return StringInSlice(fieldValue, computeDataDisksValues)
 }
 
 // diskTypeValidator is used to validate Type field.
 func diskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, diskTypeValues)
+	return StringInSlice(fieldValue, diskTypeValues)
 }
 
 // flipgroupClientTypeValidator is used to validate ClientType field.
 func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, flipgroupClientTypeValues)
+	return StringInSlice(fieldValue, flipgroupClientTypeValues)
 }
 
 // kvmNetTypeValidator is used to validate NetType field.
 func kvmNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, kvmNetTypeValues)
+	return StringInSlice(fieldValue, kvmNetTypeValues)
 }
 
 // lbAlgorithmValidator is used to validate Algorithm field.
 func lbAlgorithmValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, lbAlgorithmValues)
+	return StringInSlice(fieldValue, lbAlgorithmValues)
 }
 
 // rgDefNetValidator is used to validate DefNet field.
 func rgDefNetValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, rgDefNetValues)
+	return StringInSlice(fieldValue, rgDefNetValues)
 }
 
 // rgNetTypeValidator is used to validate NetType field.
 func rgNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, rgNetTypeValues)
+	return StringInSlice(fieldValue, rgNetTypeValues)
 }
 
 // vinsTypeValidator is used to validate Type field.
 func vinsTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, vinsTypeValues)
+	return StringInSlice(fieldValue, vinsTypeValues)
 }
 
 // imageBootTypeValidator is used to validate BootType field.
 func imageBootTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, imageBootTypeValues)
+	return StringInSlice(fieldValue, imageBootTypeValues)
 }
 
 // imageTypeValidator is used to validate ImageType field.
 func imageTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, imageTypeValues)
+	return StringInSlice(fieldValue, imageTypeValues)
 }
 
 // imageDriversValidator is used to validate Drivers field.
@@ -207,7 +194,7 @@ func imageDriversValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, item := range fieldSlice {
-		if !IsInSlice(item, imageDriversValues) {
+		if !StringInSlice(item, imageDriversValues) {
 			return false
 		}
 	}
@@ -219,14 +206,14 @@ func imageDriversValidator(fe validator.FieldLevel) bool {
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, imageArchitectureValues)
+	return StringInSlice(fieldValue, imageArchitectureValues)
 }
 
 // sepFieldTypeValidator is used to validate FieldType field.
 func sepFieldTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, sepFieldTypeValues)
+	return StringInSlice(fieldValue, sepFieldTypeValues)
 }
 
 // hwPathValidator is used to validate HWPath field.
@@ -243,7 +230,7 @@ func networkPluginValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return IsInSlice(fieldValue, networkPluginValues)
+	return StringInSlice(fieldValue, networkPluginValues)
 }
 
 // networkPluginsValidator is used to validate NetworkPlugins field
@@ -256,7 +243,7 @@ func networkPluginsValidator(fe validator.FieldLevel) bool {
 	for _, item := range fieldSlice {
 		item = strings.ToLower(item)
 
-		if !IsInSlice(item, networkPluginValues) {
+		if !StringInSlice(item, networkPluginValues) {
 			return false
 		}
 	}
@@ -268,35 +255,14 @@ func interfaceStateValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return IsInSlice(fieldValue, interfaceStateValues)
+	return StringInSlice(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)
+	return StringInSlice(fieldValue, strictLooseValues)
 }
 
 // name workerGroup must be more 3 symbol
@@ -306,111 +272,3 @@ func workerGroupNameValidator(fe validator.FieldLevel) bool {
 
 	return len(fieldValue) >= 3
 }
-
-func sortByValidator(fe validator.FieldLevel) bool {
-
-	sortByRegexp := regexp.MustCompile(`^[+-][a-zA-Z_]+`)
-
-	return sortByRegexp.MatchString(fe.Field().String())
-}
-
-func actionValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, actionValues)
-}
-
-func vmActionValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, vmActionValues)
-}
-
-func mtuValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().Uint()
-
-	return fieldValue >= uint64(mtuMin) && fieldValue <= uint64(mtuMax)
-}
-
-func computeFeaturesValidator(fe validator.FieldLevel) bool {
-	field := fe.Field()
-	slice, ok := field.Interface().([]string)
-	if !ok {
-		return false
-	}
-
-	return IsSubSlice(slice, computeFeaturesValues)
-}
-
-func networkInterfaceNamingValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, networkInterfaceNamingValues)
-}
-
-func numaAffinityValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, numaAffinityValues)
-}
-
-// kvmx86NetTypeValidator is used to validate NetType field for x86 compute.
-func kvmx86NetTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, kvmx86NetTypeValues)
-}
-
-func isBoolTypeValidator(fe validator.FieldLevel) bool {
-	return fe.Field().CanConvert(reflect.TypeOf(true))
-}
-
-func urlValidartor(fl validator.FieldLevel) bool {
-	fieldValues := fl.Field().String()
-
-	_, err := url.ParseRequestURI(fieldValues)
-	return err == nil
-}
-
-func chipsetValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, chipsetValues)
-}
-
-func preferredCPUValidator(fe validator.FieldLevel) bool {
-	fieldSlice, ok := fe.Field().Interface().([]int64)
-	if !ok {
-		return false
-	}
-
-	for _, value := range fieldSlice {
-		if value < -1 {
-			return false
-		}
-	}
-
-	return true
-}
-
-// 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...)
-}

internal/validators/helper.go

@@ -2,7 +2,6 @@ package validators
 
 import (
 	"errors"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
 
 	"github.com/go-playground/validator/v10"
 )
@@ -21,20 +20,12 @@ 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 IsInSlice(str string, target []string) bool {
+func StringInSlice(str string, target []string) bool {
 	for _, v := range target {
 		if v == str {
 			return true
@@ -42,12 +33,3 @@ func IsInSlice(str string, target []string) bool {
 	}
 	return false
 }
-
-func IsSubSlice(source []string, target []string) bool {
-	for _, s := range source {
-		if !IsInSlice(s, target) {
-			return false
-		}
-	}
-	return true
-}

internal/validators/messages.go

@@ -25,8 +25,6 @@ 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())
 
 	case "driver":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -91,18 +89,6 @@ 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,
@@ -147,7 +133,7 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
-	// KVM_X86 Validators
+	// KVM_X86/KVM_PPC Validators
 	case "kvmNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -243,71 +229,6 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(interfaceStateValues))
-
-	case "interfaceTXModel":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(txModelValues))
-
-	case "interfaceIOEventFD":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(ioEventFDValues))
-
-	case "interfaceEventIDx":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(eventIDxValues))
-
-	case "sortBy":
-		return fmt.Sprintf("%s %s must be in format +|-(field)",
-			prefix,
-			fe.Field())
-
-	case "action":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(actionValues))
-
-	case "vmaction":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(vmActionValues))
-
-	case "computeFeatures":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(computeFeaturesValues))
-
-	case "networkInterfaceNaming":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(networkInterfaceNamingValues))
-
-	case "numaAffinity":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(numaAffinityValues))
-
-	case "kvmx86NetType":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(kvmx86NetTypeValues))
-
-	case "chipset":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(chipsetValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -25,7 +25,6 @@ func getDecortValidator() *validator.Validate {
 
 // registerAllValidators registers all custom validators in DecortValidator.
 func registerAllValidators(validate *validator.Validate) error {
-
 	err := validate.RegisterValidation("proto", protoValidator)
 	if err != nil {
 		return err
@@ -106,11 +105,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("computex86NetType", computex86NetTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("computeOrder", computeOrderValidator)
 	if err != nil {
 		return err
@@ -186,85 +180,10 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("interfaceTXModel", interfaceTXModelValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("interfaceIOEventFD", interfaceIOEventFDValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("interfaceEventIDx", interfaceEventIDxValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("workerGroupName", workerGroupNameValidator)
 	if err != nil {
 		return err
 	}
 
-	err = validate.RegisterValidation("sortBy", sortByValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("action", actionValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("vmaction", vmActionValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("mtu", mtuValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("computeFeatures", computeFeaturesValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("networkInterfaceNaming", networkInterfaceNamingValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("numaAffinity", numaAffinityValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("kvmx86NetType", kvmx86NetTypeValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("isBool", isBoolTypeValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("url", urlValidartor)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("chipset", chipsetValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("preferredCPU", preferredCPUValidator)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/validators/values.go

@@ -1,7 +1,7 @@
 package validators
 
 var (
-	driverValues     = []string{"KVM_X86"}
+	driverValues     = []string{"KVM_X86", "KVM_PPC"}
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
@@ -15,7 +15,6 @@ var (
 	computeModeValues      = []string{"EQ", "EN", "ANY"}
 	computeDiskTypeValues  = []string{"D", "B"}
 	computeNetTypeValues   = []string{"EXTNET", "VINS"}
-	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK"}
 	computeOrderValues     = []string{"cdrom", "network", "hd"}
 	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
 	computeDriverValues    = []string{"KVM_X86", "SVA_KVM_X86"}
@@ -25,49 +24,24 @@ var (
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
 	kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
-	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC", "DPDK"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
 	rgDefNetValues  = []string{"PRIVATE", "PUBLIC", "NONE"}
 	rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
 
-	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
+	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDE"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
 	imageTypeValues         = []string{"windows", "linux", "other"}
 	imageDriversValues      = []string{"KVM_X86"}
-	imageArchitectureValues = []string{"X86_64"}
+	imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 
-	networkPluginValues = []string{"flannel", "weavenet", "calico"}
+	networkPluginValues = []string{"flannel", "weawenet", "calico"}
 
 	strictLooseValues = []string{"strict", "loose"}
 
 	interfaceStateValues = []string{"on", "off"}
-
-	actionValues = []string{"power_on", "shutdown", "force_shutdown", "reboot"}
-
-	vmActionValues = []string{"stop", "move"}
-
-	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic"}
-
-	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"}
-)
-
-const (
-	mtuMin = 1
-
-	mtuMax = 9216
 )

legacy-client.go

@@ -4,22 +4,25 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"io"
+	"mime/multipart"
 	"net/http"
 	"net/url"
+	"strconv"
 	"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/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 )
 
-// LegacyDecortClient is Legacy HTTP-client for platform
+// Legacy HTTP-client for platform
 type LegacyDecortClient struct {
 	decortURL  string
 	client     *http.Client
@@ -50,7 +53,7 @@ func NewLegacy(cfg config.LegacyConfig) *LegacyDecortClient {
 				},
 			},
 		},
-		cfg:        trimLegacyConfig(&cfg),
+		cfg:        cfg,
 		expiryTime: expiryTime,
 		mutex:      &sync.Mutex{},
 	}
@@ -68,181 +71,263 @@ 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) {
-	// get token
+	if k8sCreateReq, ok := params.(k8s.CreateRequest); ok {
+		reqBody := &bytes.Buffer{}
+		writer := multipart.NewWriter(reqBody)
+		if k8sCreateReq.OidcCertificate != "" {
+			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
+			_, _ = io.Copy(part, strings.NewReader(k8sCreateReq.OidcCertificate))
+		}
+
+		_ = writer.WriteField("name", k8sCreateReq.Name)
+		_ = writer.WriteField("rgId", strconv.FormatUint(k8sCreateReq.RGID, 10))
+		_ = writer.WriteField("k8ciId", strconv.FormatUint(k8sCreateReq.K8SCIID, 10))
+		_ = writer.WriteField("workerGroupName", k8sCreateReq.WorkerGroupName)
+		_ = writer.WriteField("networkPlugin", k8sCreateReq.NetworkPlugin)
+
+		if k8sCreateReq.MasterSEPID != 0 {
+			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCreateReq.MasterSEPID, 10))
+		}
+		if k8sCreateReq.MasterSEPPool != "" {
+			_ = writer.WriteField("masterSepPool", k8sCreateReq.MasterSEPPool)
+		}
+		if k8sCreateReq.WorkerSEPID != 0 {
+			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCreateReq.WorkerSEPID, 10))
+		}
+		if k8sCreateReq.WorkerSEPPool != "" {
+			_ = writer.WriteField("workerSepPool", k8sCreateReq.WorkerSEPPool)
+		}
+
+		if k8sCreateReq.Labels != nil {
+			for _, v := range k8sCreateReq.Labels {
+				_ = writer.WriteField("labels", v)
+			}
+		}
+		if k8sCreateReq.Taints != nil {
+			for _, v := range k8sCreateReq.Taints {
+				_ = writer.WriteField("taints", v)
+			}
+		}
+		if k8sCreateReq.Annotations != nil {
+			for _, v := range k8sCreateReq.Annotations {
+				_ = writer.WriteField("annotations", v)
+			}
+		}
+
+		if k8sCreateReq.MasterCPU != 0 {
+			_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(k8sCreateReq.MasterCPU), 10))
+		}
+		if k8sCreateReq.MasterNum != 0 {
+			_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(k8sCreateReq.MasterNum), 10))
+		}
+		if k8sCreateReq.MasterRAM != 0 {
+			_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(k8sCreateReq.MasterRAM), 10))
+		}
+		if k8sCreateReq.MasterDisk != 0 {
+			_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(k8sCreateReq.MasterDisk), 10))
+		}
+		if k8sCreateReq.WorkerCPU != 0 {
+			_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(k8sCreateReq.WorkerCPU), 10))
+		}
+		if k8sCreateReq.WorkerNum != 0 {
+			_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(k8sCreateReq.WorkerNum), 10))
+		}
+		if k8sCreateReq.WorkerRAM != 0 {
+			_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(k8sCreateReq.WorkerRAM), 10))
+		}
+		if k8sCreateReq.WorkerDisk != 0 {
+			_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(k8sCreateReq.WorkerDisk), 10))
+		}
+		if k8sCreateReq.ExtNetID != 0 {
+			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCreateReq.ExtNetID, 10))
+		}
+		if k8sCreateReq.VinsId != 0 {
+			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCreateReq.VinsId, 10))
+		}
+		if !k8sCreateReq.WithLB {
+			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCreateReq.WithLB))
+		}
+
+		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCreateReq.HighlyAvailable))
+
+		if k8sCreateReq.AdditionalSANs != nil {
+			for _, v := range k8sCreateReq.AdditionalSANs {
+				_ = writer.WriteField("additionalSANs", v)
+			}
+		}
+		if k8sCreateReq.InitConfiguration != "" {
+			_ = writer.WriteField("initConfiguration", k8sCreateReq.InitConfiguration)
+		}
+		if k8sCreateReq.ClusterConfiguration != "" {
+			_ = writer.WriteField("clusterConfiguration", k8sCreateReq.ClusterConfiguration)
+		}
+		if k8sCreateReq.KubeletConfiguration != "" {
+			_ = writer.WriteField("kubeletConfiguration", k8sCreateReq.KubeletConfiguration)
+		}
+		if k8sCreateReq.KubeProxyConfiguration != "" {
+			_ = writer.WriteField("kubeProxyConfiguration", k8sCreateReq.KubeProxyConfiguration)
+		}
+		if k8sCreateReq.JoinConfiguration != "" {
+			_ = writer.WriteField("joinConfiguration", k8sCreateReq.JoinConfiguration)
+		}
+		if k8sCreateReq.Description != "" {
+			_ = writer.WriteField("desc", k8sCreateReq.Description)
+		}
+		if k8sCreateReq.UserData != "" {
+			_ = writer.WriteField("userData", k8sCreateReq.UserData)
+		}
+
+		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCreateReq.ExtNetOnly))
+		_ = writer.FormDataContentType()
+
+		ct := writer.FormDataContentType()
+
 		if err := ldc.getToken(ctx); err != nil {
 			return nil, err
 		}
 
-	var body *bytes.Buffer
+		_ = writer.WriteField("authkey", ldc.cfg.Token)
-	var ctype string
 
-	byteSlice, ok := params.([]byte)
+		writer.Close()
-	if ok {
+
-		body = bytes.NewBuffer(byteSlice)
+		req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, reqBody)
-		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)
+		resp, err := ldc.domp(req, ct)
 		if err != nil {
 			return nil, err
 		}
+		defer resp.Body.Close()
 
-	// perform request
+		respBytes, err := io.ReadAll(resp.Body)
-	respBytes, err := ldc.do(req, ctype)
 		if err != nil {
 			return nil, err
 		}
 
-	return respBytes, err
+		if resp.StatusCode != 200 {
-}
+			return nil, errors.New(string(respBytes))
+		}
 
-func (ldc *LegacyDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+		return respBytes, nil
-	body, ctype, err := multiPartReq(params)
+	}
+
+	values, err := query.Values(params)
 	if err != nil {
 		return nil, err
 	}
 
-	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
+	if err = ldc.getToken(ctx); err != nil {
+		return nil, err
+	}
+
+	body := strings.NewReader(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
+
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, body)
 	if err != nil {
 		return nil, err
 	}
 
-	// get token
+	resp, err := ldc.do(req)
-	if err = ldc.getToken(ctx); err != nil {
+	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
-	// perform request
+	respBytes, err := io.ReadAll(resp.Body)
-	respBytes, err := ldc.do(req, ctype)
 	if err != nil {
 		return nil, err
 	}
 
-	return respBytes, err
+	if resp.StatusCode != 200 {
+		return nil, errors.New(string(respBytes))
+	}
+
+	return respBytes, nil
 }
 
 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) {
-	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, _ := http.NewRequestWithContext(ctx, "POST", ldc.cfg.DecortURL+"/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 || resp == nil {
-		return fmt.Errorf("cannot get token: %w", err)
-	}
-	defer resp.Body.Close()
-
-	var tokenBytes []byte
-	tokenBytes, err = io.ReadAll(resp.Body)
 		if err != nil {
-		return fmt.Errorf("cannot get token: %w", err)
+			return fmt.Errorf("unable to get token: %w", err)
 		}
 
+		tokenBytes, _ := io.ReadAll(resp.Body)
+		resp.Body.Close()
+
 		if resp.StatusCode != 200 {
-		return fmt.Errorf("cannot get token: %s", tokenBytes)
+			return fmt.Errorf("unable to 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.
+func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
-// 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)
+	// var resp *http.Response
-	if err != nil {
+	// var err error
-		return nil, err
+	buf, _ := io.ReadAll(req.Body)
-	}
+	// req = req.Clone(req.Context())
 
-	req.Body.Close()
+	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
 
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
 	resp, err := ldc.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 < 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
+	if resp.StatusCode == 200 {
+		return resp, err
+	}
+	respBytes, _ := io.ReadAll(resp.Body)
+	err = fmt.Errorf("%s", respBytes)
+	resp.Body.Close()
 	// 	}
-	//
-	//	// 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
+	return nil, fmt.Errorf("could not execute request: %w", err)
-	if err != nil {
+}
-		return nil, err
-	}
-	if resp == nil {
-		return nil, fmt.Errorf("got empty response without error")
-	}
 
-	// handle successful request
+func (ldc *LegacyDecortClient) domp(req *http.Request, ctype string) (*http.Response, error) {
-	respBytes, _ := io.ReadAll(resp.Body)
+	req.Header.Add("Content-Type", ctype)
+	req.Header.Add("Authorization", "bearer "+ldc.cfg.Token)
+	req.Header.Set("Accept", "application/json")
+
+	// var resp *http.Response
+	// var err error
+	buf, _ := io.ReadAll(req.Body)
+	// req = req.Clone(req.Context())
+
+	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	resp, err := ldc.client.Do(req)
+
+	// if err == nil {
 	if resp.StatusCode == 200 {
-		return respBytes, nil
+		return resp, err
 	}
-
+	respBytes, _ := io.ReadAll(resp.Body)
-	// handle errors with status code other than 200
 	err = fmt.Errorf("%s", respBytes)
-	return nil, fmt.Errorf("could not execute request: %w", err)
+	resp.Body.Close()
-}
+	// }
+	// }
 
-func trimLegacyConfig(cfg *config.LegacyConfig) config.LegacyConfig {
+	return nil, fmt.Errorf("could not execute request: %w", err)
-	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"
 )
 
-// AddUserRequest struct to add permission to access account for a user
+// Request struct for adding permission to access to account for a user
 type AddUserRequest struct {
 	// ID of account to add to
 	// Required: true
@@ -30,7 +30,9 @@ type AddUserRequest struct {
 func (a Account) AddUser(ctx context.Context, req AddUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// AuditsRequest struct to give list of account audits
+// Request struct for give list account audits
 type AuditsRequest struct {
 	// ID of the account
 	// Required: true
@@ -19,7 +19,9 @@ type AuditsRequest struct {
 func (a Account) Audits(ctx context.Context, req AuditsRequest) (ListAudits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/audits"

pkg/cloudapi/account/create.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// CreateRequest struct for creating account
+// Request struct for creating account
 type CreateRequest struct {
 	// Display name
 	// Required: true
@@ -56,7 +56,9 @@ type CreateRequest struct {
 func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return 0, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/create"

pkg/cloudapi/account/delete.go

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

pkg/cloudapi/account/delete_user.go

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

pkg/cloudapi/account/get.go

@@ -8,40 +8,36 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// GetRequest struct to get information about account
+// Request struct for get information about account
 type GetRequest struct {
 	// ID an account
 	// Required: true
     AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 }
 
-// Get gets account details as a RecordAccount struct
+// Get gets account details
 func (a Account) Get(ctx context.Context, req GetRequest) (*RecordAccount, error) {
-	res, err := a.GetRaw(ctx, req)
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, err
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
-	info := RecordAccount{}
+	url := "/cloudapi/account/get"
 
-	err = json.Unmarshal(res, &info)
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
 
-	return &info, nil
+	info := RecordAccount{}
-
-}
 
-// GetRaw gets account details as an array of bytes
+	err = json.Unmarshal(res, &info)
-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))
+		return nil, err
 	}
 
-	url := "/cloudapi/account/get"
+	return &info, nil
 
-	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"
 )
 
-// GetConsumedAccountUnitsRequest struct to calculate the currently consumed units for all cloudspaces and resource groups in the account
+// Request struct for calculate the currently consumed units for all cloudspaces and resource groups in the account
 type GetConsumedAccountUnitsRequest struct {
 	// ID an account
 	// Required: true
@@ -25,7 +25,9 @@ type GetConsumedAccountUnitsRequest struct {
 func (a Account) GetConsumedAccountUnits(ctx context.Context, req GetConsumedAccountUnitsRequest) (*ResourceLimits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// GetConsumedCloudUnitsByTypeRequest struct to calculate the currently consumed cloud units of the specified type for all cloudspaces and resource groups in the account
+// Request struct for calculate the currently consumed cloud units of the specified type for all cloudspaces and resource groups in the account
 type GetConsumedCloudUnitsByTypeRequest struct {
 	// ID an account
 	// Required: true
@@ -35,7 +35,9 @@ type GetConsumedCloudUnitsByTypeRequest struct {
 func (a Account) GetConsumedCloudUnitsByType(ctx context.Context, req GetConsumedCloudUnitsByTypeRequest) (float64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return 0, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/getConsumedCloudUnitsByType"

pkg/cloudapi/account/get_consumption.go

@@ -0,0 +1,62 @@
+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"
 )
 
-// GetReservedAccountUnitsRequest struct to calculate the reserved units for all cloudspaces and resource groups in the account
+// Request struct for calculate the reserved units for all cloudspaces and resource groups in the account
 type GetReservedAccountUnitsRequest struct {
 	// ID an account
 	// Required: true
@@ -26,7 +26,9 @@ type GetReservedAccountUnitsRequest struct {
 func (a Account) GetReservedAccountUnits(ctx context.Context, req GetReservedAccountUnitsRequest) (*ResourceLimits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/getReservedAccountUnits"

pkg/cloudapi/account/get_resource_consumption.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// GetResourceConsumptionRequest struct to get resource consumption
+// Request struct for getting resource consumption
 type GetResourceConsumptionRequest struct {
 	// ID an account
 	// Required: true
@@ -19,7 +19,9 @@ type GetResourceConsumptionRequest struct {
 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))
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/getResourceConsumption"

pkg/cloudapi/account/ids.go

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

pkg/cloudapi/account/list_computes.go

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

pkg/cloudapi/account/list_deleted.go

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

pkg/cloudapi/account/list_disks.go

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

pkg/cloudapi/account/list_flipgroups.go

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

pkg/cloudapi/account/list_rg.go

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

pkg/cloudapi/account/list_templates.go

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

pkg/cloudapi/account/list_vins.go

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

pkg/cloudapi/account/models.go

@@ -53,9 +53,6 @@ type ItemAccount struct {
 	// Access Control List
 	ACL []RecordACL `json:"acl"`
 
-	// Compute Features
-	ComputeFeatures []string `json:"computeFeatures"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
@@ -179,9 +176,6 @@ type RecordAccount struct {
 	// Company URL
 	CompanyURL string `json:"companyurl"`
 
-	// Compute Features
-	ComputeFeatures []string `json:"computeFeatures"`
-
 	// Computes
 	Computes Computes `json:"computes"`
 
@@ -380,12 +374,6 @@ 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"`
 

pkg/cloudapi/account/restore.go

@@ -6,7 +6,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// RestoreRequest struct to restore a deleted account
+// Request struct for restore a deleted account
 type RestoreRequest struct {
 	// ID an account
 	// Required: true
@@ -17,7 +17,9 @@ type RestoreRequest struct {
 func (a Account) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/restore"

pkg/cloudapi/account/update.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// UpdateRequest struct to update account
+// Request struct for updaate account
 type UpdateRequest struct {
 	// ID an account
 	// Required: true
@@ -45,18 +45,15 @@ type UpdateRequest struct {
 	// Limit (positive) or disable (0) GPU resources
 	// Required: false
 	GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
-
-	// List of strings with pools
-	// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
-	// Required: false
-	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
 }
 
 // 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 {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// UpdateUserRequest struct to update user access rights
+// Request struct for update user access rights
 type UpdateUserRequest struct {
 	// ID of the account
 	// Required: true
@@ -30,7 +30,9 @@ type UpdateUserRequest struct {
 func (a Account) UpdateUser(ctx context.Context, req UpdateUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/account/updateUser"

pkg/cloudapi/audit.go

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

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

@@ -1,46 +0,0 @@
-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:"auditGuid" json:"auditGuid" 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

@@ -1,41 +0,0 @@
-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"
 )
 
-// CreateRequest struct for BasicService
+// Request struct for BasicService
 type CreateRequest struct {
 	// Name of the service
 	// Required: true
@@ -31,7 +31,9 @@ type CreateRequest struct {
 func (b BService) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return 0, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/bservice/create"

pkg/cloudapi/bservice/delete.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// DeleteRequest struct to delete basic service
+// Request struct for delete basic service
 type DeleteRequest struct {
 	// ID of the BasicService to be delete
 	// Required: true
@@ -23,7 +23,9 @@ type DeleteRequest struct {
 func (b BService) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// DisableRequest struct for disable service
+// Request struct for disable service
 type DisableRequest struct {
 	// ID of the service to disable
 	// Required: true
@@ -21,10 +21,12 @@ type DisableRequest struct {
 func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
-	url := "/cloudapi/bservice/disable"
+	url := "/cloudapi/bservice/delete"
 
 	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"
 )
 
-// EnableRequest struct to disable service
+// Request struct for disable service
 type EnableRequest struct {
 	// ID of the service to enable
 	// Required: true
@@ -22,7 +22,9 @@ type EnableRequest struct {
 func (b BService) Enable(ctx context.Context, req EnableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/bservice/enable"

pkg/cloudapi/bservice/get.go

@@ -8,39 +8,35 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// GetRequest struct to get detailed information about service
+// Request struct for 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 as a RecordBasicService struct
+// Get gets detailed specifications for the BasicService.
 func (b BService) Get(ctx context.Context, req GetRequest) (*RecordBasicService, error) {
-	res, err := b.GetRaw(ctx, req)
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, err
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
-	info := RecordBasicService{}
+	url := "/cloudapi/bservice/get"
 
-	err = json.Unmarshal(res, &info)
+	bsRaw, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
 
-	return &info, nil
+	info := RecordBasicService{}
-}
 
-// GetRaw gets detailed specifications for the BasicService as an array of bytes
+	err = json.Unmarshal(bsRaw, &info)
-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))
+		return nil, err
 	}
 
-	url := "/cloudapi/bservice/get"
+	return &info, nil
-
-	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
 }

pkg/cloudapi/bservice/group_add.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// GroupAddRequest struct to create new compute group within BasicService
+// Request struct for create new compute group within BasicService
 type GroupAddRequest struct {
 	// ID of the Basic Service to add a group to
 	// Required: true
@@ -41,6 +41,7 @@ type GroupAddRequest struct {
 	// Compute driver
 	// should be one of:
 	//	- KVM_X86
+	//	- KVM_PPC
 	// Required: true
     Driver string `url:"driver" json:"driver" validate:"driver"`
 
@@ -73,23 +74,15 @@ type GroupAddRequest struct {
 	UserData string `url:"userData,omitempty" json:"userData,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.
 // Compute Group is NOT started automatically,
 // so you need to explicitly start it
 func (b BService) GroupAdd(ctx context.Context, req GroupAddRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return 0, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/bservice/groupAdd"

pkg/cloudapi/bservice/group_compute_remove.go

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

pkg/cloudapi/bservice/group_get.go

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

pkg/cloudapi/bservice/group_parent_add.go

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

pkg/cloudapi/bservice/group_parent_remove.go

@@ -8,8 +8,8 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// GroupParentRemoveRequest struct to remove parent Compute Group
+// Request struct for remove parent Compute Group
-// relation from the specified Compute Group
+// relation to the specified Compute Group
 type GroupParentRemoveRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -29,7 +29,9 @@ type GroupParentRemoveRequest struct {
 func (b BService) GroupParentRemove(ctx context.Context, req GroupParentRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// GroupRemoveRequest struct for destroy the specified Compute Group
+// Request struct for destroy the specified Compute Group
 type GroupRemoveRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -23,7 +23,9 @@ type GroupRemoveRequest struct {
 func (b BService) GroupRemove(ctx context.Context, req GroupRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// GroupResizeRequest struct to resize the group
+// Request struct for resize the group
 type GroupResizeRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -34,7 +34,9 @@ type GroupResizeRequest struct {
 func (b BService) GroupResize(ctx context.Context, req GroupResizeRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// GroupStartRequest struct to start the specified Compute Group
+// Request struct for start the specified Compute Group
 type GroupStartRequest struct {
 	// ID of the Basic Service of Compute Group
 	// Required: true
@@ -23,7 +23,9 @@ type GroupStartRequest struct {
 func (b BService) GroupStart(ctx context.Context, req GroupStartRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/bservice/groupStart"

pkg/cloudapi/bservice/group_stop.go

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

pkg/cloudapi/bservice/group_update.go

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

pkg/cloudapi/bservice/ids.go

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

pkg/cloudapi/bservice/list_deleted.go

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

pkg/cloudapi/bservice/models.go

@@ -93,7 +93,7 @@ type RecordBasicService struct {
 // Main information about Compute
 type ItemCompute struct {
 	// Account ID
-	AccountID uint64 `json:"accountId"`
+	AccountID uint64
 
 	// Architecture
 	Architecture string `json:"arch"`
@@ -168,17 +168,8 @@ type ItemSnapshot struct {
 	Valid bool `json:"valid"`
 }
 
-// List of Snapshot
-type ListSnapshots []ItemSnapshot
-
 // List of Snapshots
-type ListInfoSnapshots struct {
+type ListSnapshots []ItemSnapshot
-	// Data
-	Data ListSnapshots `json:"data"`
-
-	// EntryCount
-	EntryCount uint64 `json:"entryCount"`
-}
 
 // Main information about Group
 type RecordGroup struct {

pkg/cloudapi/bservice/restore.go

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

pkg/cloudapi/bservice/snapshot_create.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// SnapshotCreateRequest struct to create snapshot
+// Request struct for create snapshot
 type SnapshotCreateRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -23,7 +23,9 @@ type SnapshotCreateRequest struct {
 func (b BService) SnapshotCreate(ctx context.Context, req SnapshotCreateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// SnapshotDeleteRequest struct to delete snapshot
+// Request struct for delete snapshot
 type SnapshotDeleteRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -23,7 +23,9 @@ type SnapshotDeleteRequest struct {
 func (b BService) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// SnapshotListRequest struct to get list of existing snapshots
+// Request struct for get list existing snapshots
 type SnapshotListRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -16,10 +16,12 @@ type SnapshotListRequest struct {
 }
 
 // SnapshotList gets list existing snapshots of the Basic Service
-func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListInfoSnapshots, error) {
+func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (ListSnapshots, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/bservice/snapshotList"
@@ -29,12 +31,12 @@ func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*L
 		return nil, err
 	}
 
-	list := ListInfoSnapshots{}
+	list := ListSnapshots{}
 
 	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"
 )
 
-// SnapshotRollbackRequest struct to rollback snapshot
+// Request struct for rollback snapshot
 type SnapshotRollbackRequest struct {
 	// ID of the Basic Service
 	// Required: true
@@ -23,7 +23,9 @@ type SnapshotRollbackRequest struct {
 func (b BService) SnapshotRollback(ctx context.Context, req SnapshotRollbackRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/bservice/snapshotRollback"

pkg/cloudapi/bservice/start.go

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

pkg/cloudapi/compute/affinity_group_check_start.go

@@ -7,7 +7,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// AffinityGroupCheckStartRequest struct to check all computes with current affinity label can start
+// Request struct for check all computes with current affinity label can start
 type AffinityGroupCheckStartRequest struct {
 	// ID of the resource group
 	// Required: true
@@ -22,7 +22,9 @@ type AffinityGroupCheckStartRequest struct {
 func (c Compute) AffinityGroupCheckStart(ctx context.Context, req AffinityGroupCheckStartRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// AffinityLabelRemoveRequest struct to clear affinity label for compute
+// Request struct for clear affinity label for compute
 type AffinityLabelRemoveRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -19,7 +19,9 @@ type AffinityLabelRemoveRequest struct {
 func (c Compute) AffinityLabelRemove(ctx context.Context, req AffinityLabelRemoveRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range 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"
 )
 
-// AffinityLabelSetRequest struct to set affinity label for compute
+// Request struct for set affinity label for compute
 type AffinityLabelSetRequest struct {
 	// ID of the compute instance
 	// Required: true
@@ -23,7 +23,9 @@ type AffinityLabelSetRequest struct {
 func (c Compute) AffinityLabelSet(ctx context.Context, req AffinityLabelSetRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/compute/affinityLabelSet"

pkg/cloudapi/compute/affinity_relations.go

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

pkg/cloudapi/compute/affinity_rule_add.go

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

pkg/cloudapi/compute/affinity_rule_remove.go

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

pkg/cloudapi/compute/affinity_rules_clear.go

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

pkg/cloudapi/compute/anti_affinity_rule_add.go

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

pkg/cloudapi/compute/anti_affinity_rule_remove.go

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

pkg/cloudapi/compute/anti_affinity_rules_clear.go

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

pkg/cloudapi/compute/attach_gpu.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// AttachGPURequest struct to attach GPU for compute
+// Request struct for attach GPU for compute
 type AttachGPURequest struct {
 	// Identifier compute
 	// Required: true
@@ -23,7 +23,9 @@ type AttachGPURequest struct {
 func (c Compute) AttachGPU(ctx context.Context, req AttachGPURequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return 0, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/compute/attachGpu"

pkg/cloudapi/compute/attach_pci_device.go

@@ -8,7 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// AttachPCIDeviceRequest struct to attach PCI device
+// Request struct for atttach PCI device
 type AttachPCIDeviceRequest struct {
 	// Identifier compute
 	// Required: true
@@ -23,7 +23,9 @@ type AttachPCIDeviceRequest struct {
 func (c Compute) AttachPCIDevice(ctx context.Context, req AttachPCIDeviceRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/compute/attachPciDevice"

pkg/cloudapi/compute/audits.go

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

pkg/cloudapi/compute/boot_disk_set.go

@@ -1,42 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// BootDiskSetRequest struct to set boot disk for compute
-type BootDiskSetRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// ID of the disk to set as boot
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-}
-
-// BootDiskSet sets boot disk for compute
-func (c Compute) BootDiskSet(ctx context.Context, req BootDiskSetRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/bootDiskSet"
-
-	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/boot_order_get.go

@@ -7,7 +7,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// BootOrderGetRequest struct to get boot order
+// Request struct for getting boot order
 type BootOrderGetRequest struct {
 	// Compute ID
 	// Required: true
@@ -18,7 +18,9 @@ type BootOrderGetRequest struct {
 func (c Compute) BootOrderGet(ctx context.Context, req BootOrderGetRequest) ([]string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/compute/bootOrderGet"

pkg/cloudapi/compute/boot_order_set.go

@@ -7,7 +7,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// BootOrderSetRequest struct to set boot order
+// Request struct for setting boot order
 type BootOrderSetRequest struct {
 	// ID of compute instance
 	// Required: true
@@ -26,7 +26,9 @@ type BootOrderSetRequest struct {
 func (c Compute) BootOrderSet(ctx context.Context, req BootOrderSetRequest) ([]string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudapi/compute/bootOrderSet"

pkg/cloudapi/compute/cd_eject.go

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

pkg/cloudapi/compute/cd_insert.go

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

pkg/cloudapi/compute/change_ip.go

@@ -1,54 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ChangeIPRequest struct to change IP for network
-type ChangeIPRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Network type
-	// 'EXTNET' for connect to external network directly
-	// 'VINS' for connect to ViNS
-	// Required: true
-	NetType string `url:"netType" json:"netType" validate:"computeNetType"`
-
-	// Network ID for connect to
-	// For EXTNET - external network ID
-	// For VINS - VINS ID
-	// Required: true
-	NetID uint64 `url:"netId" json:"netId" validate:"required"`
-
-	// IP address to which we will change the existing one, it must be from the same subnet
-	// Required: true
-	IPAddr string `url:"ipAddr" json:"ipAddr" validate:"required"`
-}
-
-// ChangeIP change reserved IP for compute instance
-func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/changeIp"
-
-	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
-}