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

4.9.9

Browse Source
This commit is contained in:
dayterr
2026-03-06 16:11:37 +03:00
parent 476a09ed53
commit a475cf3f75
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,8 +1,8 @@
## Version 4.9.8 ## Version 4.9.9
### Исправлено ### Исправлено
#### kvmvmm #### kvmvmm
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | --- |
| BATF-1220 | Ошибки применения новой конфигурации после импортирования в resource `decort_kvmvm` в cloudapi/kvmvm и в `decort_cb_kvmvm` в cloudbroker/kvmvm | | BATF-1241 | Ошибки применения новой конфигурации после импортирования в resource `decort_kvmvm` в cloudapi/kvmvm |

2
Makefile
View File

@@ -7,7 +7,7 @@ ZIPDIR = ./zip
BINARY=${NAME} BINARY=${NAME}
WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH}
MAINPATH = ./cmd/decort/ MAINPATH = ./cmd/decort/
VERSION=4.9.8 VERSION=4.9.9
OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
FILES = ${BINARY}_${VERSION}_darwin_amd64\ FILES = ${BINARY}_${VERSION}_darwin_amd64\

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

@@ -276,10 +276,6 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} { func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
res := make([]map[string]interface{}, 0, len(disksList)) res := make([]map[string]interface{}, 0, len(disksList))
if len(disksBlocks) == 0 {
return res
}
sort.Slice(disksList, func(i, j int) bool { sort.Slice(disksList, func(i, j int) bool {
return disksList[i].ID < disksList[j].ID return disksList[i].ID < disksList[j].ID
}) })
@@ -291,7 +287,11 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, ex
continue continue
} }
pernamentlyValue := disksBlocks[indexDataDisks].(map[string]interface{})["permanently"].(bool) permanentlyValue := false
if indexDataDisks < len(disksBlocks) {
permanentlyValue = disksBlocks[indexDataDisks].(map[string]interface{})["permanently"].(bool)
}
temp := map[string]interface{}{ temp := map[string]interface{}{
"disk_name": disk.Name, "disk_name": disk.Name,
@@ -305,7 +305,7 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, ex
"desc": disk.Description, "desc": disk.Description,
"image_id": disk.ImageID, "image_id": disk.ImageID,
"size": disk.SizeMax, "size": disk.SizeMax,
"permanently": pernamentlyValue, "permanently": permanentlyValue,
"present_to": disk.PresentTo, "present_to": disk.PresentTo,
} }
res = append(res, temp) res = append(res, temp)

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

@@ -1815,6 +1815,7 @@ func disksSubresourceSchemaMake() map[string]*schema.Schema {
"permanently": { "permanently": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: false,
Description: "Disk deletion status", Description: "Disk deletion status",
}, },
"disk_id": { "disk_id": {