v1.6.0-teta

client.go

@@ -76,109 +76,109 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 		writer := multipart.NewWriter(reqBody)
 		if k8sCreateReq.OidcCertificate != "" {
 			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-			_, _ =io.Copy(part, strings.NewReader(k8sCreateReq.OidcCertificate))
+			_, _ = 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)
+		_ = 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))
+			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCreateReq.MasterSEPID, 10))
 		}
 		if k8sCreateReq.MasterSEPPool != "" {
-			_= writer.WriteField("masterSepPool", k8sCreateReq.MasterSEPPool)
+			_ = writer.WriteField("masterSepPool", k8sCreateReq.MasterSEPPool)
 		}
 		if k8sCreateReq.WorkerSEPID != 0 {
-			_= writer.WriteField("workerSepId", strconv.FormatUint(k8sCreateReq.WorkerSEPID, 10))
+			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCreateReq.WorkerSEPID, 10))
 		}
 		if k8sCreateReq.WorkerSEPPool != "" {
-			_= writer.WriteField("workerSepPool", k8sCreateReq.WorkerSEPPool)
+			_ = writer.WriteField("workerSepPool", k8sCreateReq.WorkerSEPPool)
 		}
 
 		if k8sCreateReq.Labels != nil {
 			for _, v := range k8sCreateReq.Labels {
-				_= writer.WriteField("labels", v)
+				_ = writer.WriteField("labels", v)
 			}
 		}
 		if k8sCreateReq.Taints != nil {
 			for _, v := range k8sCreateReq.Taints {
-				_= writer.WriteField("taints", v)
+				_ = writer.WriteField("taints", v)
 			}
 		}
 		if k8sCreateReq.Annotations != nil {
 			for _, v := range k8sCreateReq.Annotations {
-				_= writer.WriteField("annotations", v)
+				_ = writer.WriteField("annotations", v)
 			}
 		}
 
 		if k8sCreateReq.MasterCPU != 0 {
-			_= writer.WriteField("masterCpu", strconv.FormatUint(uint64(k8sCreateReq.MasterCPU), 10))
+			_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(k8sCreateReq.MasterCPU), 10))
 		}
 		if k8sCreateReq.MasterNum != 0 {
-			_= writer.WriteField("masterNum", strconv.FormatUint(uint64(k8sCreateReq.MasterNum), 10))
+			_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(k8sCreateReq.MasterNum), 10))
 		}
 		if k8sCreateReq.MasterRAM != 0 {
-			_= writer.WriteField("masterRam", strconv.FormatUint(uint64(k8sCreateReq.MasterRAM), 10))
+			_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(k8sCreateReq.MasterRAM), 10))
 		}
 		if k8sCreateReq.MasterDisk != 0 {
-			_= writer.WriteField("masterDisk", strconv.FormatUint(uint64(k8sCreateReq.MasterDisk), 10))
+			_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(k8sCreateReq.MasterDisk), 10))
 		}
 		if k8sCreateReq.WorkerCPU != 0 {
-			_= writer.WriteField("workerCpu", strconv.FormatUint(uint64(k8sCreateReq.WorkerCPU), 10))
+			_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(k8sCreateReq.WorkerCPU), 10))
 		}
 		if k8sCreateReq.WorkerNum != 0 {
-			_= writer.WriteField("workerNum", strconv.FormatUint(uint64(k8sCreateReq.WorkerNum), 10))
+			_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(k8sCreateReq.WorkerNum), 10))
 		}
 		if k8sCreateReq.WorkerRAM != 0 {
-			_= writer.WriteField("workerRam", strconv.FormatUint(uint64(k8sCreateReq.WorkerRAM), 10))
+			_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(k8sCreateReq.WorkerRAM), 10))
 		}
 		if k8sCreateReq.WorkerDisk != 0 {
-			_= writer.WriteField("workerDisk", strconv.FormatUint(uint64(k8sCreateReq.WorkerDisk), 10))
+			_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(k8sCreateReq.WorkerDisk), 10))
 		}
 		if k8sCreateReq.ExtNetID != 0 {
-			_= writer.WriteField("extnetId", strconv.FormatUint(k8sCreateReq.ExtNetID, 10))
+			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCreateReq.ExtNetID, 10))
 		}
 		if k8sCreateReq.VinsId != 0 {
-			_= writer.WriteField("vinsId", strconv.FormatUint(k8sCreateReq.VinsId, 10))
+			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCreateReq.VinsId, 10))
 		}
 		if !k8sCreateReq.WithLB {
-			_= writer.WriteField("withLB", strconv.FormatBool(k8sCreateReq.WithLB))
+			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCreateReq.WithLB))
 		}
 
-		_= writer.WriteField("highlyAvailable", strconv.FormatBool(k8sCreateReq.HighlyAvailable))
+		_ = writer.WriteField("highlyAvailable", strconv.FormatBool(k8sCreateReq.HighlyAvailable))
 
 		if k8sCreateReq.AdditionalSANs != nil {
 			for _, v := range k8sCreateReq.AdditionalSANs {
-				_= writer.WriteField("additionalSANs", v)
+				_ = writer.WriteField("additionalSANs", v)
 			}
 		}
 		if k8sCreateReq.InitConfiguration != "" {
-			_= writer.WriteField("initConfiguration", k8sCreateReq.InitConfiguration)
+			_ = writer.WriteField("initConfiguration", k8sCreateReq.InitConfiguration)
 		}
 		if k8sCreateReq.ClusterConfiguration != "" {
-			_= writer.WriteField("clusterConfiguration", k8sCreateReq.ClusterConfiguration)
+			_ = writer.WriteField("clusterConfiguration", k8sCreateReq.ClusterConfiguration)
 		}
 		if k8sCreateReq.KubeletConfiguration != "" {
-			_= writer.WriteField("kubeletConfiguration", k8sCreateReq.KubeletConfiguration)
+			_ = writer.WriteField("kubeletConfiguration", k8sCreateReq.KubeletConfiguration)
 		}
 		if k8sCreateReq.KubeProxyConfiguration != "" {
-			_= writer.WriteField("kubeProxyConfiguration", k8sCreateReq.KubeProxyConfiguration)
+			_ = writer.WriteField("kubeProxyConfiguration", k8sCreateReq.KubeProxyConfiguration)
 		}
 		if k8sCreateReq.JoinConfiguration != "" {
-			_= writer.WriteField("joinConfiguration", k8sCreateReq.JoinConfiguration)
+			_ = writer.WriteField("joinConfiguration", k8sCreateReq.JoinConfiguration)
 		}
 		if k8sCreateReq.Description != "" {
-			_= writer.WriteField("desc", k8sCreateReq.Description)
+			_ = writer.WriteField("desc", k8sCreateReq.Description)
 		}
 		if k8sCreateReq.UserData != "" {
-			_= writer.WriteField("userData", k8sCreateReq.UserData)
+			_ = writer.WriteField("userData", k8sCreateReq.UserData)
 		}
 
-		_= writer.WriteField("extnetOnly", strconv.FormatBool(k8sCreateReq.ExtNetOnly))
-		_= writer.FormDataContentType()
+		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCreateReq.ExtNetOnly))
+		_ = writer.FormDataContentType()
 
 		ct := writer.FormDataContentType()
 
@@ -281,24 +281,24 @@ func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
 	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
 	req.Header.Set("Accept", "application/json")
 
-	var resp *http.Response
-	var err error
+	// var resp *http.Response
+	// var err error
 	buf, _ := io.ReadAll(req.Body)
-	req = req.Clone(req.Context())
+	// req = req.Clone(req.Context())
 
-	for i := uint64(0); i < dc.cfg.Retries; i++ {
-		req.Body = io.NopCloser(bytes.NewBuffer(buf))
-		resp, err = dc.client.Do(req)
+	// for i := uint64(0); i < dc.cfg.Retries; i++ {
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	resp, err := dc.client.Do(req)
 
-		// if err == nil {
-		if resp.StatusCode == 200 {
-			return resp, err
-		}
-		respBytes, _ := io.ReadAll(resp.Body)
-		err = fmt.Errorf("%s", respBytes)
-		resp.Body.Close()
-		// }
+	// if err == nil {
+	if resp.StatusCode == 200 {
+		return resp, err
 	}
+	respBytes, _ := io.ReadAll(resp.Body)
+	err = fmt.Errorf("%s", respBytes)
+	resp.Body.Close()
+	// }
+	// }
 
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
@@ -308,24 +308,24 @@ func (dc *DecortClient) domp(req *http.Request, ctype string) (*http.Response, e
 	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
 	req.Header.Set("Accept", "application/json")
 
-	var resp *http.Response
-	var err error
+	// var resp *http.Response
+	// var err error
 	buf, _ := io.ReadAll(req.Body)
 	req = req.Clone(req.Context())
 
-	for i := uint64(0); i < dc.cfg.Retries; i++ {
-		req.Body = io.NopCloser(bytes.NewBuffer(buf))
-		resp, err = dc.client.Do(req)
+	// for i := uint64(0); i < dc.cfg.Retries; i++ {
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	resp, err := dc.client.Do(req)
 
-		// if err == nil {
-		if resp.StatusCode == 200 {
-			return resp, err
-		}
-		respBytes, _ := io.ReadAll(resp.Body)
-		err = fmt.Errorf("%s", respBytes)
-		resp.Body.Close()
-		// }
+	// if err == nil {
+	if resp.StatusCode == 200 {
+		return resp, err
 	}
+	respBytes, _ := io.ReadAll(resp.Body)
+	err = fmt.Errorf("%s", respBytes)
+	resp.Body.Close()
+	// }
+	// }
 
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }

legacy-client.go

@@ -7,8 +7,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"mime/multipart"
 	"net/http"
 	"net/url"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -16,6 +18,7 @@ import (
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
 	"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"
 )
 
@@ -68,6 +71,148 @@ 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) {
+	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("highlyAvailable", 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
+		}
+
+		_ = writer.WriteField("authkey", ldc.cfg.Token)
+
+		writer.Close()
+
+		req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, reqBody)
+		if err != nil {
+			return nil, err
+		}
+
+		resp, err := ldc.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
+		}
+
+		if resp.StatusCode != 200 {
+			return nil, errors.New(string(respBytes))
+		}
+
+		return respBytes, nil
+	}
+
 	values, err := query.Values(params)
 	if err != nil {
 		return nil, err
@@ -140,10 +285,10 @@ func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
 	// var resp *http.Response
 	// var err error
 	buf, _ := io.ReadAll(req.Body)
-	req = req.Clone(req.Context())
+	// req = req.Clone(req.Context())
 
 	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
-	req = req.Clone(req.Context())
+
 	req.Body = io.NopCloser(bytes.NewBuffer(buf))
 	resp, err := ldc.client.Do(req)
 
@@ -159,3 +304,30 @@ func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
 
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
+
+func (ldc *LegacyDecortClient) domp(req *http.Request, ctype string) (*http.Response, error) {
+	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 resp, err
+	}
+	respBytes, _ := io.ReadAll(resp.Body)
+	err = fmt.Errorf("%s", respBytes)
+	resp.Body.Close()
+	// }
+	// }
+
+	return nil, fmt.Errorf("could not execute request: %w", err)
+}