4.3.2

CHANGELOG.md

@@ -1,4 +1,5 @@
-## Version 4.3.1
+## Version 4.3.2
 
 ## Bugfixes
-- Deleted custom_fields field from kvmvm resource
+- Fixed bootdisk flattens
+- Updated golang-decort-sdk version with fixed permamently field in cloudapi/cloudbroker/compute/diskDel

Makefile

@@ -7,10 +7,11 @@ ZIPDIR = ./zip
 BINARY=${NAME}
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=4.3.1
-#OS_ARCH=darwin_amd64
+VERSION=4.3.2
+OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
+# OS_ARCH=darwin_arm64
 # OS_ARCH=windows_amd64
-OS_ARCH=linux_amd64
+# OS_ARCH=linux_amd64
 
 FILES = ${BINARY}_${VERSION}_darwin_amd64\
 		${BINARY}_${VERSION}_darwin_arm64\

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

go.sum

@@ -339,5 +339,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.5.1 h1:6uvGmrmMaHRU+RV2G6xLX4tjecqalDG5PwvBv5J2LUM=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.5.1/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.5.3 h1:Rt5tE4EZcUr4ONK9u/XYe2mG1CC37xLUnNuCLYKDwYs=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.5.3/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=

internal/service/cloudapi/kvmvm/flattens.go

@@ -36,6 +36,7 @@ import (
 	"encoding/json"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
@@ -239,7 +240,7 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
 func flattenComputeDisksDemo(disksList compute.ListComputeDisks, extraDisks []interface{}) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(disksList))
 	for _, disk := range disksList {
-		if disk.Name == "bootdisk" || findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
+		if strings.Contains(disk.Name, "bootdisk") || findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
 			continue
 		}
 		temp := map[string]interface{}{
@@ -280,7 +281,7 @@ func flattenNetwork(interfaces compute.ListInterfaces) []map[string]interface{}
 
 func findBootDisk(disks compute.ListComputeDisks) *compute.ItemComputeDisk {
 	for _, disk := range disks {
-		if disk.Name == "bootdisk" {
+		if strings.Contains(disk.Name, "bootdisk") {
 			return &disk
 		}
 	}

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -772,7 +772,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 			for _, disk := range deletedDisks {
 				diskConv := disk.(map[string]interface{})
-				if diskConv["disk_name"].(string) == "bootdisk" {
+				if strings.Contains(diskConv["disk_name"].(string), "bootdisk") {
 					continue
 				}
 
@@ -800,7 +800,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		if len(addedDisks) > 0 {
 			for _, disk := range addedDisks {
 				diskConv := disk.(map[string]interface{})
-				if diskConv["disk_name"].(string) == "bootdisk" {
+				if strings.Contains(diskConv["disk_name"].(string), "bootdisk") {
 					continue
 				}
 				req := compute.DiskAddRequest{
@@ -832,7 +832,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		if len(updatedDisks) > 0 {
 			for _, disk := range updatedDisks {
 				diskConv := disk.(map[string]interface{})
-				if diskConv["disk_name"].(string) == "bootdisk" {
+				if strings.Contains(diskConv["disk_name"].(string), "bootdisk") {
 					continue
 				}
 				req := compute.DiskResizeRequest{