4.2.3

CHANGELOG.md

@@ -1,8 +1,4 @@
-## Version 4.2.0
+## Version 4.2.3
 
-## Features
-- Added "decort_k8s_cp" resource:
-	- Used to create k8s cluster and manage control plane, therefore does not contain any info about worker nodes
-	- Use decort_k8s_wg to add/delete/manage worker nodes with decort_k8s_cp
-- Added "ignore_k8s" field to "decort_kvmvm_list" data source.
-	- Set to true to list all computes not associated with any k8s cluster.
+## Bug Fixes
+- Made "ipcidr" field in decort_vins resource optional

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.0
+VERSION=4.2.3
 #OS_ARCH=darwin_amd64
 OS_ARCH=windows_amd64
 #OS_ARCH=linux_amd64

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.4
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.4.7
 )
 
 require (

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.4 h1:qoot6a9UPOihncfhmhmyzMd0nGVAzY/b1Gvs+AFk1/k=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.4.4/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.4.7 h1:1lHhvOsMX5iFQ4z2qmVT7cORbCr+hTeEH9Lk1E2liYE=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.4.7/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=

internal/service/cloudapi/k8s/resource_k8s.go

@@ -143,11 +143,7 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 		}
 	}
 
-	if withLB, ok := d.GetOk("with_lb"); ok {
-		createReq.WithLB = withLB.(bool)
-	} else {
-		createReq.WithLB = true
-	}
+	createReq.WithLB = d.Get("with_lb").(bool)
 
 	if extNet, ok := d.GetOk("extnet_id"); ok {
 		createReq.ExtNetID = uint64(extNet.(int))

internal/service/cloudapi/k8s/resource_k8s_cp.go

@@ -127,11 +127,7 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		createReq.MasterSEPPool = sepPool.(string)
 	}
 
-	if withLB, ok := d.GetOk("with_lb"); ok {
-		createReq.WithLB = withLB.(bool)
-	} else {
-		createReq.WithLB = true
-	}
+	createReq.WithLB = d.Get("with_lb").(bool)
 
 	if extNet, ok := d.GetOk("extnet_id"); ok {
 		createReq.ExtNetID = uint64(extNet.(int))

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)

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)