From 8a813abfcb7cdca4e782302147fe4ff0070e409d Mon Sep 17 00:00:00 2001
From: nlloskutova <nlloskutova@basistech.ru>
Date: Fri, 22 Mar 2024 12:11:46 +0300
Subject: [PATCH] v1.6.14

---
 CHANGELOG.md                          | 8 +++-----
 client.go                             | 2 +-
 legacy-client.go                      | 3 ++-
 pkg/cloudapi/bservice/disable.go      | 2 +-
 pkg/cloudapi/disks/delete.go          | 2 +-
 pkg/cloudapi/disks/delete_disks.go    | 2 +-
 pkg/cloudapi/k8s/delete.go            | 4 ++--
 pkg/cloudbroker/disks/delete.go       | 2 +-
 pkg/cloudbroker/disks/delete_disks.go | 2 +-
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d625d3..20fce4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,5 @@
-## Version 1.6.12
+## Version 1.6.14
 
 ### 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
\ No newline at end of file
+- Delete tag required from DeleteRequest field Permanently in cloudapi/k8s
+- Delete tag omitempty from DeleteDisksRequest and DisksDeleteRequest field Permanently in cloudapi/disks and cloudbroker/disks
\ No newline at end of file
diff --git a/client.go b/client.go
index 5e4a66a..4ea08ce 100644
--- a/client.go
+++ b/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 {
diff --git a/legacy-client.go b/legacy-client.go
index 07b07e4..c0005a0 100644
--- a/legacy-client.go
+++ b/legacy-client.go
@@ -156,10 +156,11 @@ 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 {
diff --git a/pkg/cloudapi/bservice/disable.go b/pkg/cloudapi/bservice/disable.go
index f19faf0..a17eb32 100644
--- a/pkg/cloudapi/bservice/disable.go
+++ b/pkg/cloudapi/bservice/disable.go
@@ -24,7 +24,7 @@ func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudapi/bservice/delete"
+	url := "/cloudapi/bservice/disable"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
diff --git a/pkg/cloudapi/disks/delete.go b/pkg/cloudapi/disks/delete.go
index 030de9e..b2e4507 100644
--- a/pkg/cloudapi/disks/delete.go
+++ b/pkg/cloudapi/disks/delete.go
@@ -20,7 +20,7 @@ type DeleteRequest struct {
 
 	// Whether to completely delete the disk, works only with non attached disks
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 
 	// Reason to delete
 	// Required: false
diff --git a/pkg/cloudapi/disks/delete_disks.go b/pkg/cloudapi/disks/delete_disks.go
index ebbe743..31fad19 100644
--- a/pkg/cloudapi/disks/delete_disks.go
+++ b/pkg/cloudapi/disks/delete_disks.go
@@ -20,7 +20,7 @@ type DisksDeleteRequest struct {
 
 	// Whether to completely delete the disks, works only with non attached disks
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }
 
 // DeleteDisks deletes multiple disks permanently
diff --git a/pkg/cloudapi/k8s/delete.go b/pkg/cloudapi/k8s/delete.go
index 7f9fdfe..464f9d9 100644
--- a/pkg/cloudapi/k8s/delete.go
+++ b/pkg/cloudapi/k8s/delete.go
@@ -16,8 +16,8 @@ type DeleteRequest struct {
 
 	// True if cluster is destroyed permanently.
 	// Otherwise it can be restored from Recycle Bin
-	// Required: true
-	Permanently bool `url:"permanently" json:"permanently" validate:"required"`
+	// Required: false
+	Permanently bool `url:"permanently" json:"permanently"`
 }
 
 // Delete deletes kubernetes cluster
diff --git a/pkg/cloudbroker/disks/delete.go b/pkg/cloudbroker/disks/delete.go
index 0408db5..57abb1f 100644
--- a/pkg/cloudbroker/disks/delete.go
+++ b/pkg/cloudbroker/disks/delete.go
@@ -20,7 +20,7 @@ type DeleteRequest struct {
 
 	// Whether to completely delete the disk, works only with non attached disks
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 
 	// Reason to delete
 	// Required: false
diff --git a/pkg/cloudbroker/disks/delete_disks.go b/pkg/cloudbroker/disks/delete_disks.go
index 7c6a228..ba124d4 100644
--- a/pkg/cloudbroker/disks/delete_disks.go
+++ b/pkg/cloudbroker/disks/delete_disks.go
@@ -20,7 +20,7 @@ type DeleteDisksRequest struct {
 
 	// Whether to completely delete the disks, works only with non attached disks
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }
 
 // DeleteDisks deletes multiple disks permanently