From 10e3e198925846977d9dfc365a8986ca2d0c4a90 Mon Sep 17 00:00:00 2001 From: Tim Tkachev Date: Thu, 4 May 2023 16:15:35 +0300 Subject: [PATCH] v1.4.1 --- CHANGELOG.md | 50 ++++--------------------------- go.mod | 3 +- go.sum | 6 ++++ pkg/cloudapi/account/create.go | 2 +- pkg/cloudapi/account/update.go | 2 +- pkg/cloudapi/k8s/worker_add.go | 15 +++++----- pkg/cloudbroker/account/create.go | 2 +- pkg/cloudbroker/account/update.go | 2 +- 8 files changed, 26 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4ff33..39b2e47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,44 +1,6 @@ -## Version 1.4.0 - -### Features - -- Actualized SDK to platform version 3.8.6: - - Added required field networkPlugin to requests in: - - /cloudapi/cloudbroker/k8s/create; - - /cloudbroker/k8ci/create. - - Added networkPlugin field in models: - - /cloudapi/cloudbroker/k8s; - - /cloudbroker/k8ci. - - Updated list of compute objects fields and added list of group objects in bservice model. - - Added cpuAllocationRatio and cpuAllocationParameter fields in models: - - /cloudapi/cloudbroker/rg; - - /cloudapi/cloudbroker/account. - - Added setCpuAllocationRatio endpoint support in: - - /cloudbroker/account; - - /cloudbroker/rg. - - Added /cloudbrocker/grid/setCpuAllocationRatioForVM endpoint support. - - Added setCpuAllocationParameter endpoint support in: - - /cloudbroker/account; - - /cloudbroker/rg; - - /cloudbroker/grid. - - Added cloudapi/cloudbroker/compute/changeLinkState endpoint support. - -- Added enabled field in cloudapi/compute models: - - interfaces in compute/list response; - - RecordNetAttach (compute/netAttach response). - -- Added cloudapi/compute/bootOrderSet endpoint support. - -- Added cloudapi/compute/bootOrderGet endpoint support. - -### Bug Fixes - -- Fixed pciSlot field type in models: - - cloudapi/cloudbroker/computes; - - cloudapi/cloudbroker/vins. - -- Fixed handling cloudapi/account/restore endpoint response (panicked when marhalling). - -- Added missing field diskType in cloudapi/compute/diskAttach request. - -- Added missing eBurst field in cloudapi/extnet QOS model. +## Version 1.4.1 + +### Bug Fixes + +- Fixed cloudapi/k8s/workerAdd returning value type +- Fixed cloudapi/cloudbroker/account/create/update SendAccessEmails field tags diff --git a/go.mod b/go.mod index ee03956..beb7e0e 100644 --- a/go.mod +++ b/go.mod @@ -5,14 +5,15 @@ go 1.20 require ( github.com/go-playground/validator/v10 v10.11.2 github.com/google/go-querystring v1.1.0 + 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/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.1 // indirect golang.org/x/crypto v0.5.0 // indirect golang.org/x/sys v0.4.0 // indirect golang.org/x/text v0.6.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index d2c9a3a..a641cd7 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -11,10 +12,14 @@ 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-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= @@ -26,6 +31,7 @@ golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/cloudapi/account/create.go b/pkg/cloudapi/account/create.go index a2f7b8e..cfb3405 100644 --- a/pkg/cloudapi/account/create.go +++ b/pkg/cloudapi/account/create.go @@ -44,7 +44,7 @@ type CreateRequest struct { // If true send emails when a user is granted access to resources // Required: false - SendAccessEmails bool `url:"sendAccessEmails,omitempty" json:"sendAccessEmails,omitempty"` + SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"` // Limit (positive) or disable (0) GPU resources // Required: false diff --git a/pkg/cloudapi/account/update.go b/pkg/cloudapi/account/update.go index 5973f55..3811e10 100644 --- a/pkg/cloudapi/account/update.go +++ b/pkg/cloudapi/account/update.go @@ -40,7 +40,7 @@ type UpdateRequest struct { // If true send emails when a user is granted access to resources // Required: false - SendAccessEmails bool `url:"sendAccessEmails,omitempty" json:"sendAccessEmails,omitempty"` + SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"` // Limit (positive) or disable (0) GPU resources // Required: false diff --git a/pkg/cloudapi/k8s/worker_add.go b/pkg/cloudapi/k8s/worker_add.go index bc465f5..94ef37a 100644 --- a/pkg/cloudapi/k8s/worker_add.go +++ b/pkg/cloudapi/k8s/worker_add.go @@ -2,9 +2,8 @@ package k8s import ( "context" + "encoding/json" "net/http" - "strconv" - "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" ) @@ -24,11 +23,11 @@ type WorkerAddRequest struct { } // WorkerAdd add worker nodes to a Kubernetes cluster -func (k8s K8S) WorkerAdd(ctx context.Context, req WorkerAddRequest) (bool, error) { +func (k8s K8S) WorkerAdd(ctx context.Context, req WorkerAddRequest) ([]uint64, error) { err := validators.ValidateRequest(req) if err != nil { for _, validationError := range validators.GetErrors(err) { - return false, validators.ValidationError(validationError) + return nil, validators.ValidationError(validationError) } } @@ -36,12 +35,14 @@ func (k8s K8S) WorkerAdd(ctx context.Context, req WorkerAddRequest) (bool, error res, err := k8s.client.DecortApiCall(ctx, http.MethodPost, url, req) if err != nil { - return false, err + return nil, err } - result, err := strconv.ParseBool(string(res)) + result := make([]uint64, 0) + + err = json.Unmarshal(res, &result) if err != nil { - return false, err + return nil, err } return result, nil diff --git a/pkg/cloudbroker/account/create.go b/pkg/cloudbroker/account/create.go index 0a15595..6f6df07 100644 --- a/pkg/cloudbroker/account/create.go +++ b/pkg/cloudbroker/account/create.go @@ -44,7 +44,7 @@ type CreateRequest struct { // If true send emails when a user is granted access to resources // Required: false - SendAccessEmails bool `url:"sendAccessEmails,omitempty" json:"sendAccessEmails,omitempty"` + SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"` // Limit (positive) or disable (0) GPU resources // Required: false diff --git a/pkg/cloudbroker/account/update.go b/pkg/cloudbroker/account/update.go index 75853f4..72f71fb 100644 --- a/pkg/cloudbroker/account/update.go +++ b/pkg/cloudbroker/account/update.go @@ -48,7 +48,7 @@ type UpdateRequest struct { // If true send emails when a user is granted access to resources // Required: false - SendAccessEmails bool `url:"sendAccessEmails,omitempty" json:"sendAccessEmails,omitempty"` + SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"` // Limit (positive) or disable (0) GPU resources // Required: false