1.6.0-beta

CHANGELOG.md

@@ -1,4 +1,4 @@
-## Version 1.5.6
+## Version 1.6.0-beta
 
 ### Bugfix
-- Fix the RecordLB field, add the RecordLBList field to cloudbroker/lb/models to correctly receive information on get and list requests
+- Fixed RoudTrip bug in HTTP transport, made it concurrent safe

internal/client/http-client.go

@@ -3,6 +3,7 @@ package client
 import (
 	"crypto/tls"
 	"net/http"
+	"sync"
 	"time"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
@@ -32,6 +33,7 @@ func NewHttpClient(cfg config.Config) *http.Client {
 			ssoURL:       cfg.SSOURL,
 			token:        cfg.Token,
 			expiryTime:   expiredTime,
+			mutex:        &sync.Mutex{},
 			//TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		},
 

internal/client/legacy-http-client.go

@@ -4,6 +4,7 @@ import (
 	"crypto/tls"
 	"net/http"
 	"net/url"
+	"sync"
 	"time"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
@@ -33,6 +34,7 @@ func NewLegacyHttpClient(cfg config.LegacyConfig) *http.Client {
 			token:      cfg.Token,
 			decortURL:  cfg.DecortURL,
 			expiryTime: expiredTime,
+			mutex:      &sync.Mutex{},
 		},
 
 		Timeout: cfg.Timeout.Get(),

internal/client/legacy-transport.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -15,6 +16,7 @@ type transportLegacy struct {
 	retries    uint64
 	token      string
 	decortURL  string
+	mutex      *sync.Mutex
 	expiryTime time.Time
 }
 
@@ -56,7 +58,9 @@ func (t *transportLegacy) RoundTrip(request *http.Request) (*http.Response, erro
 	var resp *http.Response
 	var err error
 	for i := uint64(0); i < t.retries; i++ {
+		t.mutex.Lock()
 		resp, err = t.base.RoundTrip(req)
+		t.mutex.Unlock()
 		if err == nil {
 			if resp.StatusCode == 200 {
 				return resp, nil

internal/client/transport.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -16,6 +17,7 @@ type transport struct {
 	token        string
 	ssoURL       string
 	expiryTime   time.Time
+	mutex        *sync.Mutex
 }
 
 func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
@@ -53,7 +55,9 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
 	var resp *http.Response
 	var err error
 	for i := uint64(0); i < t.retries; i++ {
+		t.mutex.Lock()
 		resp, err = t.base.RoundTrip(req)
+		t.mutex.Unlock()
 		if err == nil {
 			if resp.StatusCode == 200 {
 				return resp, nil
@@ -65,5 +69,6 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
 		//logrus.Errorf("Could not execute request: %v. Retrying %d/%d", err, i+1, t.retries)
 		time.Sleep(time.Second * 5)
 	}
+
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }

pkg/cloudapi/k8s/create.go

@@ -106,6 +106,10 @@ type CreateRequest struct {
 	// Text description of this Kubernetes cluster
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
+	//Use only selected ExtNet for infrastructure connections
+	// Required: false
+	ExtNetOnly bool `url:"extnetOnly,omitempty" json:"extnetOnly,omitempty"`
 }
 
 // Create creates a new Kubernetes cluster in the specified Resource Group

pkg/cloudapi/lb/create.go

@@ -2,6 +2,7 @@ package lb
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"strings"
 
@@ -20,16 +21,16 @@ type CreateRequest struct {
 	Name string `url:"name" json:"name" validate:"required"`
 
 	// External network to connect this load balancer to
-	// Required: true
-	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
+	// Required: false
+	ExtNetID uint64 `url:"extnetId" json:"extnetId"`
 
 	// Internal network (VINS) to connect this load balancer to
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
+	// Required: false
+	VINSID uint64 `url:"vinsId" json:"vinsId"`
 
 	// Start now Load balancer
-	// Required: true
-	Start bool `url:"start" json:"start" validate:"required"`
+	// Required: false
+	Start bool `url:"start" json:"start"`
 
 	// Text description of this load balancer
 	// Required: false
@@ -45,6 +46,10 @@ func (l LB) Create(ctx context.Context, req CreateRequest) (string, error) {
 		}
 	}
 
+	if req.ExtNetID == 0 && req.VINSID == 0 {
+		return "", errors.New ("vinsId and extNetId cannot be both in the value 0")
+	}
+
 	url := "/cloudapi/lb/create"
 
 	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudbroker/grid/filter.go

@@ -2,7 +2,7 @@ package grid
 
 // FilterByID returns ListGrids with specified ID.
 func (lg ListGrids) FilterByID(id uint64) ListGrids {
-	predicate := func(rg RecordGrid) bool {
+	predicate := func(rg ItemGridList) bool {
 		return rg.ID == id
 	}
 
@@ -11,7 +11,7 @@ func (lg ListGrids) FilterByID(id uint64) ListGrids {
 
 // FilterByName returns ListGrids with specified Name.
 func (lg ListGrids) FilterByName(name string) ListGrids {
-	predicate := func(rg RecordGrid) bool {
+	predicate := func(rg ItemGridList) bool {
 		return rg.Name == name
 	}
 
@@ -20,7 +20,7 @@ func (lg ListGrids) FilterByName(name string) ListGrids {
 
 // FilterByLocationCode returns ListGrids with specified LocationCode.
 func (lg ListGrids) FilterByLocationCode(locationCode string) ListGrids {
-	predicate := func(rg RecordGrid) bool {
+	predicate := func(rg ItemGridList) bool {
 		return rg.LocationCode == locationCode
 	}
 
@@ -28,7 +28,7 @@ func (lg ListGrids) FilterByLocationCode(locationCode string) ListGrids {
 }
 
 // FilterFunc allows filtering ListGrids based on a user-specified predicate.
-func (lg ListGrids) FilterFunc(predicate func(RecordGrid) bool) ListGrids {
+func (lg ListGrids) FilterFunc(predicate func(ItemGridList) bool) ListGrids {
 	var result ListGrids
 
 	for _, item := range lg.Data {
@@ -44,9 +44,9 @@ func (lg ListGrids) FilterFunc(predicate func(RecordGrid) bool) ListGrids {
 
 // FindOne returns first found RecordGrid.
 // If none was found, returns an empty struct.
-func (lg ListGrids) FindOne() RecordGrid {
+func (lg ListGrids) FindOne() ItemGridList {
 	if len(lg.Data) == 0 {
-		return RecordGrid{}
+		return ItemGridList{}
 	}
 
 	return lg.Data[0]

pkg/cloudbroker/grid/filter_test.go

@@ -3,7 +3,7 @@ package grid
 import "testing"
 
 var grids = ListGrids{
-	Data: []RecordGrid{
+	Data: []ItemGridList{
 		{
 			Resources: Resources{
 				Current: RecordResource{
@@ -123,7 +123,7 @@ func TestFilterByLocationCode(t *testing.T) {
 }
 
 func TestFilterFunc(t *testing.T) {
-	actual := grids.FilterFunc(func(rg RecordGrid) bool {
+	actual := grids.FilterFunc(func(rg ItemGridList) bool {
 		return rg.GID == 777
 	}).
 		FindOne()

pkg/cloudbroker/grid/models.go

@@ -18,7 +18,7 @@ type RecordResourcesConsumption struct {
 	Reserved RecordResource `json:"Reserved"`
 
 	// GID
-	GID uint64 `json:"gid"`
+	GID uint64 `json:"id"`
 }
 
 type ListResourceConsumption struct {
@@ -67,6 +67,27 @@ type DiskUsage struct {
 
 // Detailed information about grid
 type RecordGrid struct {
+	// Flag
+	Flag string `json:"flag"`
+
+	// Grid ID
+	GID uint64 `json:"gid"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Location code
+	LocationCode string `json:"locationCode"`
+
+	// Name
+	Name string `json:"name"`
+}
+
+// Information about grid
+type ItemGridList struct {
 	// Resource information
 	Resources Resources `json:"Resources"`
 
@@ -92,7 +113,7 @@ type RecordGrid struct {
 // List Grids
 type ListGrids struct {
 	//Data
-	Data []RecordGrid `json:"data"`
+	Data []ItemGridList `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`

pkg/cloudbroker/lb/create.go

@@ -29,7 +29,7 @@ type CreateRequest struct {
 
 	// Start now Load balancer
 	// Required: false
-	Start bool `url:"start" json:"start" validate:"required"`
+	Start bool `url:"start" json:"start"`
 
 	// Text description of this load balancer
 	// Required: false