Skip to content

Commit c7e60b7

Browse files
fix(resource_instance_server): delete on termination defaut value (#758)
1 parent c89b594 commit c7e60b7

3 files changed

+1842
-1706
lines changed

scaleway/resource_instance_server.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,8 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD
453453

454454
rootVolume["volume_id"] = newZonedID(zone, volume.ID).String()
455455
rootVolume["size_in_gb"] = int(uint64(volume.Size) / gb)
456-
rootVolume["delete_on_termination"] = d.Get("root_volume.0.delete_on_termination")
456+
_, rootVolumeAttributeSet := d.GetOk("root_volume") // Related to https://github.com/hashicorp/terraform-plugin-sdk/issues/142
457+
rootVolume["delete_on_termination"] = d.Get("root_volume.0.delete_on_termination").(bool) || !rootVolumeAttributeSet
457458

458459
_ = d.Set("root_volume", []map[string]interface{}{rootVolume})
459460
} else {
@@ -714,7 +715,9 @@ func resourceScalewayInstanceServerDelete(ctx context.Context, d *schema.Resourc
714715
return diag.FromErr(err)
715716
}
716717

717-
if d.Get("root_volume.0.delete_on_termination").(bool) {
718+
// Related to https://github.com/hashicorp/terraform-plugin-sdk/issues/142
719+
_, rootVolumeAttributeSet := d.GetOk("root_volume")
720+
if d.Get("root_volume.0.delete_on_termination").(bool) || !rootVolumeAttributeSet {
718721
err = instanceAPI.DeleteVolume(&instance.DeleteVolumeRequest{
719722
Zone: zone,
720723
VolumeID: expandZonedID(d.Get("root_volume.0.volume_id")).ID,

scaleway/resource_instance_server_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func TestAccScalewayInstanceServer_Minimal1(t *testing.T) {
5959
CheckDestroy: testAccCheckScalewayInstanceServerDestroy(tt),
6060
Steps: []resource.TestStep{
6161
{
62-
// Image id such as f974feac-abae-4365-b988-8ec7d1cec10d
6362
Config: `
6463
resource "scaleway_instance_server" "base" {
6564
image = "ubuntu_focal"

0 commit comments

Comments
 (0)