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

fixed boot disk reading for computes without one

Browse Source
This commit is contained in:
kjubybot
2022-07-20 11:28:00 +03:00
parent 5b4c1f4324
commit 0bdd7c3c32
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/service/cloudapi/kvmvm/data_source_compute.go
View File

@@ -34,7 +34,6 @@ package kvmvm
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
// "net/url" // "net/url"
@@ -107,14 +106,15 @@ func parseBootDiskId(disks []DiskRecord) uint {
return 0 return 0
} }
func findBootDisk(disks []DiskRecord) (*DiskRecord, error) { func findBootDisk(disks []DiskRecord) *DiskRecord {
for _, d := range disks { for _, d := range disks {
if d.Type == "B" { if d.Type == "B" {
return &d, nil return &d
} }
} }
return nil, errors.New("boot disk not found") // some computes don't have a boot disk, so...
return &DiskRecord{}
} }
// Parse the list of interfaces from compute/get response into a list of networks // Parse the list of interfaces from compute/get response into a list of networks
@@ -181,10 +181,7 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
d.Set("started", false) d.Set("started", false)
} }
bootDisk, err := findBootDisk(model.Disks) bootDisk := findBootDisk(model.Disks)
if err != nil {
return err
}
d.Set("boot_disk_size", bootDisk.SizeMax) d.Set("boot_disk_size", bootDisk.SizeMax)
d.Set("boot_disk_id", bootDisk.ID) // we may need boot disk ID in resize operations d.Set("boot_disk_id", bootDisk.ID) // we may need boot disk ID in resize operations