v1.6.12

CHANGELOG.md

@@ -1,4 +1,7 @@
-## Version 1.6.10
+## Version 1.6.12
 
-## Bugfix
-- Fix panic for nil pointer response reference in client and legacy-client
+### Bugfix
+- Fix allowed network plugin value from "weawenet" to "weavenet" in validators for cloudapi/k8s, cloudbroker/k8s and cloudbroker/k8ci
+- Delete omitempty from json, url tags in field Permanently in model DeleteRequest in cloudbroker/k8ci and cloudbroker/k8s
+- Fix panic in SnapshotList method in cloudapi/bservice
+- Fix panic in AffinityGroupsList method in cloudapi/rg

client.go

@@ -159,7 +159,7 @@ func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
-	
+
 	// handle successful request
 	respBytes, _ := io.ReadAll(resp.Body)
 	if resp.StatusCode == 200 {
@@ -174,7 +174,6 @@ func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 func createK8sCloudApi(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
 	reqBody := &bytes.Buffer{}
 	writer := multipart.NewWriter(reqBody)
-	defer writer.Close()
 	if req.OidcCertificate != "" {
 		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
 		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
@@ -281,13 +280,14 @@ func createK8sCloudApi(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
 	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
 
 	ct := writer.FormDataContentType()
+	writer.Close()
+
 	return reqBody, ct
 }
 
 func createK8sCloudBroker(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
 	reqBody := &bytes.Buffer{}
 	writer := multipart.NewWriter(reqBody)
-	defer writer.Close()
 	if req.OidcCertificate != "" {
 		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
 		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
@@ -394,5 +394,7 @@ func createK8sCloudBroker(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
 	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
 
 	ct := writer.FormDataContentType()
+
+	writer.Close()
 	return reqBody, ct
 }

internal/validators/values.go

@@ -39,7 +39,7 @@ var (
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 
-	networkPluginValues = []string{"flannel", "weawenet", "calico"}
+	networkPluginValues = []string{"flannel", "weavenet", "calico"}
 
 	strictLooseValues = []string{"strict", "loose"}
 

legacy-client.go

@@ -156,11 +156,10 @@ func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) ([]byte, erro
 		return nil, err
 	}
 	defer resp.Body.Close()
-	
 
 	// handle successful request
 	respBytes, err := io.ReadAll(resp.Body)
-	if err!= nil {
+	if err != nil {
 		return nil, err
 	}
 	if resp.StatusCode == 200 {
@@ -175,7 +174,6 @@ func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) ([]byte, erro
 func createK8sCloudApiLegacy(req k8s_ca.CreateRequest, token string) (*bytes.Buffer, string) {
 	reqBody := &bytes.Buffer{}
 	writer := multipart.NewWriter(reqBody)
-	defer writer.Close()
 	if req.OidcCertificate != "" {
 		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
 		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
@@ -284,13 +282,14 @@ func createK8sCloudApiLegacy(req k8s_ca.CreateRequest, token string) (*bytes.Buf
 	_ = writer.WriteField("authkey", token)
 
 	ct := writer.FormDataContentType()
+	writer.Close()
+
 	return reqBody, ct
 }
 
 func createK8sCloudBrokerLegacy(req k8s_cb.CreateRequest, token string) (*bytes.Buffer, string) {
 	reqBody := &bytes.Buffer{}
 	writer := multipart.NewWriter(reqBody)
-	defer writer.Close()
 	if req.OidcCertificate != "" {
 		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
 		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
@@ -399,5 +398,7 @@ func createK8sCloudBrokerLegacy(req k8s_cb.CreateRequest, token string) (*bytes.
 	_ = writer.WriteField("authkey", token)
 
 	ct := writer.FormDataContentType()
+
+	writer.Close()
 	return reqBody, ct
 }

pkg/cloudapi/bservice/models.go

@@ -169,6 +169,15 @@ type ItemSnapshot struct {
 }
 
 // List of Snapshots
+type ListInfoSnapshots struct {
+	// Data
+	Data ListSnapshots `json:"data"`
+
+	// EntryCount
+	EntryCount uint64 `json:"entryCount"`
+}
+
+// List of Snapshots inside RecordBasicService
 type ListSnapshots []ItemSnapshot
 
 // Main information about Group

pkg/cloudapi/bservice/snapshot_list.go

@@ -16,7 +16,7 @@ type SnapshotListRequest struct {
 }
 
 // SnapshotList gets list existing snapshots of the Basic Service
-func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (ListSnapshots, error) {
+func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListInfoSnapshots, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
@@ -29,12 +29,12 @@ func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (Li
 		return nil, err
 	}
 
-	list := ListSnapshots{}
+	list := ListInfoSnapshots{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/compute/affinity_rule_add.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleAdd add affinity rule

pkg/cloudapi/compute/affinity_rule_remove.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleRemove remove affinity rule

pkg/cloudapi/compute/anti_affinity_rule_add.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleAdd add anti affinity rule

pkg/cloudapi/compute/anti_affinity_rule_remove.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleRemove remove anti affinity rule

pkg/cloudapi/k8s/create.go

@@ -29,7 +29,7 @@ type CreateRequest struct {
 	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`
 
 	// Network plugin
-	// Must be one of these values: flannel, weawenet, calico
+	// Must be one of these values: flannel, weavenet, calico
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
 

pkg/cloudapi/rg/models.go

@@ -331,9 +331,18 @@ type ItemAffinityGroupComputes struct {
 // List of affinity groups
 type ListAffinityGroupsComputes []ItemAffinityGroupComputes
 
+// Main information about
+type ItemAffinityGroup struct {
+	ID     uint64 `json:"id"`
+	NodeID uint64 `json:"node_id"`
+}
+
+// List of affinity group
+type ListAffinityGroup []ItemAffinityGroup
+
 type ListAffinityGroups struct {
 	// Data
-	Data []map[string][]uint64 `json:"data"`
+	Data []map[string]ListAffinityGroup `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`

pkg/cloudbroker/compute/affinity_rule_add.go

@@ -40,8 +40,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleAdd adds affinity rule

pkg/cloudbroker/compute/affinity_rule_remove.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleRemove remove affinity rule

pkg/cloudbroker/compute/anti_affinity_rule_add.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleAdd adds anti affinity rule

pkg/cloudbroker/compute/anti_affinity_rule_remove.go

@@ -38,8 +38,8 @@ 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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleRemove removes anti affinity rule

pkg/cloudbroker/k8ci/create.go

@@ -60,7 +60,7 @@ type CreateRequest struct {
 	MaxWorkerCount uint64 `url:"maxWorkerCount" json:"maxWorkerCount" validate:"required"`
 
 	// Network plugins
-	// Values of slice must be flannel, weawenet or calico
+	// Values of slice must be flannel, weavenet or calico
 	//Required: true
 	NetworkPlugins []string `url:"networkPlugins" json:"networkPlugins" validate:"required,networkPlugins"`
 }

pkg/cloudbroker/k8ci/delete.go

@@ -16,7 +16,7 @@ type DeleteRequest struct {
 
 	// Delete permanently or not
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }
 
 // Delete deletes K8CI by ID

pkg/cloudbroker/k8s/create.go

@@ -29,7 +29,7 @@ type CreateRequest struct {
 	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`
 
 	// Network plugin
-	// Must be one of these values: flunnel, weawenet, calico
+	// Must be one of these values: flannel, weavenet, calico
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
 

pkg/cloudbroker/k8s/delete.go

@@ -17,7 +17,7 @@ type DeleteRequest struct {
 	// True if cluster is destroyed permanently.
 	// Otherwise it can be restored from recycle bin
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }
 
 // Delete deletes kubernetes cluster