BASIS/terraform-provider-decort
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 62 Wiki Activity

4.3.2

Browse Source
This commit is contained in:
Nikita Sorokin
2023-08-17 18:18:23 +03:00
parent d7a7eb9cb3
commit bf8d3fb437
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/service/cloudapi/kvmvm/flattens.go
View File

@@ -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
}
}

6
internal/service/cloudapi/kvmvm/resource_compute.go
View File

@@ -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{