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

Use SetPartial on changeable resources in update methods for compute and disk

Browse Source
This commit is contained in:
Sergey Shubin svs1370
2021-04-28 15:03:49 +03:00
parent 44bed84716
commit 5fc08e9dde
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
decort/resource_compute.go
View File

@@ -178,7 +178,6 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
2. Resize (grow) boot disk 2. Resize (grow) boot disk
3. Update extra disks 3. Update extra disks
4. Update networks 4. Update networks
5. Update port forwards
*/ */
// 1. Resize CPU/RAM // 1. Resize CPU/RAM
@@ -186,6 +185,8 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
doUpdate := false doUpdate := false
params.Add("computeId", d.Id()) params.Add("computeId", d.Id())
d.Partial(true)
oldCpu, newCpu := d.GetChange("cpu") oldCpu, newCpu := d.GetChange("cpu")
if oldCpu.(int) != newCpu.(int) { if oldCpu.(int) != newCpu.(int) {
params.Add("cpu", fmt.Sprintf("%d", newCpu.(int))) params.Add("cpu", fmt.Sprintf("%d", newCpu.(int)))
@@ -210,6 +211,8 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
if err != nil { if err != nil {
return err return err
} }
d.SetPartial("cpu")
d.SetPartial("ram")
} }
// 2. Resize (grow) Boot disk // 2. Resize (grow) Boot disk
@@ -224,6 +227,7 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
if err != nil { if err != nil {
return err return err
} }
d.SetPartial("boot_disk_size")
} else if oldSize.(int) > newSize.(int) { } else if oldSize.(int) > newSize.(int) {
log.Warnf("resourceComputeUpdate: compute ID %d - shrinking boot disk is not allowed", d.Id()) log.Warnf("resourceComputeUpdate: compute ID %d - shrinking boot disk is not allowed", d.Id())
} }
@@ -232,14 +236,20 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
err := controller.utilityComputeExtraDisksConfigure(d, true) // pass do_delta = true to apply changes, if any err := controller.utilityComputeExtraDisksConfigure(d, true) // pass do_delta = true to apply changes, if any
if err != nil { if err != nil {
return err return err
} else {
d.SetPartial("extra_disks")
} }
// 4. Calculate and apply changes to network connections // 4. Calculate and apply changes to network connections
err = controller.utilityComputeNetworksConfigure(d, true) // pass do_delta = true to apply changes, if any err = controller.utilityComputeNetworksConfigure(d, true) // pass do_delta = true to apply changes, if any
if err != nil { if err != nil {
return err return err
} else {
d.SetPartial("network")
} }
d.Partial(false)
// we may reuse dataSourceComputeRead here as we maintain similarity // we may reuse dataSourceComputeRead here as we maintain similarity
// between Compute resource and Compute data source schemas // between Compute resource and Compute data source schemas
return dataSourceComputeRead(d, m) return dataSourceComputeRead(d, m)

6
decort/resource_disk.go
View File

@@ -91,6 +91,8 @@ func resourceDiskUpdate(d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceDiskUpdate: called for Disk ID / name % d / %s, Account ID %d", log.Debugf("resourceDiskUpdate: called for Disk ID / name % d / %s, Account ID %d",
d.Get("disk_id").(int), d.Get("name").(string), d.Get("account_id").(int)) d.Get("disk_id").(int), d.Get("name").(string), d.Get("account_id").(int))
d.Partial(true)
oldSize, newSize := d.GetChange("size") oldSize, newSize := d.GetChange("size")
if oldSize.(int) > newSize.(int) { if oldSize.(int) > newSize.(int) {
return fmt.Errorf("resourceDiskUpdate: Disk ID %d - shrinking disk size from %d to %d not allowed", return fmt.Errorf("resourceDiskUpdate: Disk ID %d - shrinking disk size from %d to %d not allowed",
@@ -100,6 +102,7 @@ func resourceDiskUpdate(d *schema.ResourceData, m interface{}) error {
if oldSize.(int) == newSize.(int) { if oldSize.(int) == newSize.(int) {
log.Debugf("resourceDiskUpdate: Disk ID %d - no size change required", d.Get("disk_id").(int)) log.Debugf("resourceDiskUpdate: Disk ID %d - no size change required", d.Get("disk_id").(int))
// and there is no need to re-read disk specs either // and there is no need to re-read disk specs either
d.Partial(false)
return nil return nil
} }
@@ -112,6 +115,9 @@ func resourceDiskUpdate(d *schema.ResourceData, m interface{}) error {
if err != nil { if err != nil {
return err return err
} }
d.SetPartial("size")
d.Partial(false)
// we may reuse dataSourceDiskRead here as we maintain similarity // we may reuse dataSourceDiskRead here as we maintain similarity
// between Compute resource and Compute data source schemas // between Compute resource and Compute data source schemas