From 85ce76564f7aa191ba66f80e2670afbce8e74475 Mon Sep 17 00:00:00 2001
From: Tim Tkachev <tvtkachev@basistech.ru>
Date: Fri, 23 Jun 2023 15:30:46 +0300
Subject: [PATCH] 4.2.2

---
 CHANGELOG.md                                               | 5 +++--
 Makefile                                                   | 2 +-
 go.mod                                                     | 2 +-
 go.sum                                                     | 4 ++--
 internal/service/cloudapi/lb/resource_lb_backend_server.go | 4 ++--
 internal/service/cloudapi/vins/resource_vins.go            | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d504fca..ac14e5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-## Version 4.2.1
+## Version 4.2.2
 
 ## Bug Fixes
-- Fixed "with_lb" param false value ignore in k8s/create (resource_k8s, resource_k8s_cp)
+- Fixed inability of decort_lb_backend_server resource deletion;
+- Fixed possible panic when adding NAT rules to decort_vins resource;
diff --git a/Makefile b/Makefile
index d3a289d..d16af00 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ZIPDIR = ./zip
 BINARY=${NAME}.exe
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=4.2.1
+VERSION=4.2.2
 #OS_ARCH=darwin_amd64
 OS_ARCH=windows_amd64
 #OS_ARCH=linux_amd64
diff --git a/go.mod b/go.mod
index 555b722..50a8101 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	github.com/sirupsen/logrus v1.9.0
 	golang.org/x/net v0.5.0
-	repository.basistech.ru/BASIS/decort-golang-sdk v1.4.5
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.4.6
 )
 
 require (
diff --git a/go.sum b/go.sum
index fef5c7a..23c23b7 100644
--- a/go.sum
+++ b/go.sum
@@ -332,5 +332,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0/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=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.4.5 h1:PO80n6pvFdfVFEtmX//unRJLIkAW+SFqEXDerRJw5XU=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.4.5/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.4.6 h1:kUKBLbRGbhDQlqMvPvfdCarrXSbLmaN+YlB0cMlvyBM=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.4.6/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=
diff --git a/internal/service/cloudapi/lb/resource_lb_backend_server.go b/internal/service/cloudapi/lb/resource_lb_backend_server.go
index c325ec5..edeaedb 100644
--- a/internal/service/cloudapi/lb/resource_lb_backend_server.go
+++ b/internal/service/cloudapi/lb/resource_lb_backend_server.go
@@ -139,8 +139,8 @@ func resourceLBBackendServerDelete(ctx context.Context, d *schema.ResourceData,
 	c := m.(*controller.ControllerCfg)
 	req := lb.BackendServerDeleteRequest{
 		LBID:        uint64(d.Get("lb_id").(int)),
-		BackendName: d.Get("name").(string),
-		ServerName:  d.Get("backend_name").(string),
+		BackendName: d.Get("backend_name").(string),
+		ServerName:  d.Get("name").(string),
 	}
 
 	_, err = c.CloudAPI().LB().BackendServerDelete(ctx, req)
diff --git a/internal/service/cloudapi/vins/resource_vins.go b/internal/service/cloudapi/vins/resource_vins.go
index 0b70962..83ff2c9 100644
--- a/internal/service/cloudapi/vins/resource_vins.go
+++ b/internal/service/cloudapi/vins/resource_vins.go
@@ -578,7 +578,7 @@ func resourceVinsUpdate(ctx context.Context, d *schema.ResourceData, m interface
 				natRule := natRuleInterface.(map[string]interface{})
 				req := vins.NATRuleDelRequest{
 					VINSID: vinsData.ID,
-					RuleID: uint64(natRule["rule_id"].(int)),
+					RuleID: int64(natRule["rule_id"].(int)),
 				}
 
 				_, err := c.CloudAPI().VINS().NATRuleDel(ctx, req)