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

Add patch for compute sep_id and pool

Browse Source
This commit is contained in:
stSolo
2022-07-08 15:47:09 +03:00
parent fc32db30b6
commit 5b4c1f4324
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ func parseComputeInterfacesToNetworks(ifaces []InterfaceRecord) []interface{} {
return result return result
} }
func flattenCompute(d *schema.ResourceData, compFacts string) diag.Diagnostics { func flattenCompute(d *schema.ResourceData, compFacts string) error {
// This function expects that compFacts string contains response from API compute/get, // This function expects that compFacts string contains response from API compute/get,
// i.e. detailed information about compute instance. // i.e. detailed information about compute instance.
// //
@@ -153,7 +153,7 @@ func flattenCompute(d *schema.ResourceData, compFacts string) diag.Diagnostics {
log.Debugf("flattenCompute: ready to unmarshal string %s", compFacts) log.Debugf("flattenCompute: ready to unmarshal string %s", compFacts)
err := json.Unmarshal([]byte(compFacts), &model) err := json.Unmarshal([]byte(compFacts), &model)
if err != nil { if err != nil {
return diag.FromErr(err) return err
} }
log.Debugf("flattenCompute: ID %d, RG ID %d", model.ID, model.RgID) log.Debugf("flattenCompute: ID %d, RG ID %d", model.ID, model.RgID)
@@ -183,7 +183,7 @@ func flattenCompute(d *schema.ResourceData, compFacts string) diag.Diagnostics {
bootDisk, err := findBootDisk(model.Disks) bootDisk, err := findBootDisk(model.Disks)
if err != nil { if err != nil {
return diag.FromErr(err) return err
} }
d.Set("boot_disk_size", bootDisk.SizeMax) d.Set("boot_disk_size", bootDisk.SizeMax)
@@ -194,21 +194,21 @@ func flattenCompute(d *schema.ResourceData, compFacts string) diag.Diagnostics {
if len(model.Disks) > 0 { if len(model.Disks) > 0 {
log.Debugf("flattenCompute: calling parseComputeDisksToExtraDisks for %d disks", len(model.Disks)) log.Debugf("flattenCompute: calling parseComputeDisksToExtraDisks for %d disks", len(model.Disks))
if err = d.Set("extra_disks", parseComputeDisksToExtraDisks(model.Disks)); err != nil { if err = d.Set("extra_disks", parseComputeDisksToExtraDisks(model.Disks)); err != nil {
return diag.FromErr(err) return err
} }
} }
if len(model.Interfaces) > 0 { if len(model.Interfaces) > 0 {
log.Debugf("flattenCompute: calling parseComputeInterfacesToNetworks for %d interfaces", len(model.Interfaces)) log.Debugf("flattenCompute: calling parseComputeInterfacesToNetworks for %d interfaces", len(model.Interfaces))
if err = d.Set("network", parseComputeInterfacesToNetworks(model.Interfaces)); err != nil { if err = d.Set("network", parseComputeInterfacesToNetworks(model.Interfaces)); err != nil {
return diag.FromErr(err) return err
} }
} }
if len(model.OsUsers) > 0 { if len(model.OsUsers) > 0 {
log.Debugf("flattenCompute: calling parseOsUsers for %d logins", len(model.OsUsers)) log.Debugf("flattenCompute: calling parseOsUsers for %d logins", len(model.OsUsers))
if err = d.Set("os_users", parseOsUsers(model.OsUsers)); err != nil { if err = d.Set("os_users", parseOsUsers(model.OsUsers)); err != nil {
return diag.FromErr(err) return err
} }
} }
@@ -224,7 +224,11 @@ func dataSourceComputeRead(ctx context.Context, d *schema.ResourceData, m interf
return diag.FromErr(err) return diag.FromErr(err)
} }
return flattenCompute(d, compFacts) if err = flattenCompute(d, compFacts); err != nil {
return diag.FromErr(err)
}
return nil
} }
func DataSourceCompute() *schema.Resource { func DataSourceCompute() *schema.Resource {

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

@@ -186,8 +186,8 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
return nil return nil
} }
if diagnostic := flattenCompute(d, compFacts); diagnostic != nil { if err = flattenCompute(d, compFacts); err != nil {
return diagnostic return diag.FromErr(err)
} }
log.Debugf("resourceComputeRead: after flattenCompute: Compute ID %s, name %q, RG ID %d", log.Debugf("resourceComputeRead: after flattenCompute: Compute ID %s, name %q, RG ID %d",