Skip to content

Commit 8ea3593

Browse files
fix(resource_instance_server): delete on termination defaut value
1 parent 42c5256 commit 8ea3593

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scaleway/resource_instance_server.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,8 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD
470470

471471
rootVolume["volume_id"] = newZonedID(zone, volume.ID).String()
472472
rootVolume["size_in_gb"] = int(uint64(volume.Size) / gb)
473-
rootVolume["delete_on_termination"] = d.Get("root_volume.0.delete_on_termination")
473+
_, rootVolumeAttributeSet := d.GetOk("root_volume")
474+
rootVolume["delete_on_termination"] = d.Get("root_volume.0.delete_on_termination").(bool) || !rootVolumeAttributeSet
474475

475476
_ = d.Set("root_volume", []map[string]interface{}{rootVolume})
476477
} else {
@@ -740,7 +741,8 @@ func resourceScalewayInstanceServerDelete(ctx context.Context, d *schema.Resourc
740741
return diag.FromErr(err)
741742
}
742743

743-
if d.Get("root_volume.0.delete_on_termination").(bool) {
744+
_, rootVolumeAttributeSet := d.GetOk("root_volume")
745+
if d.Get("root_volume.0.delete_on_termination").(bool) || !rootVolumeAttributeSet {
744746
err = instanceAPI.DeleteVolume(&instance.DeleteVolumeRequest{
745747
Zone: zone,
746748
VolumeID: expandZonedID(d.Get("root_volume.0.volume_id")).ID,

scaleway/resource_instance_server_test.go

Lines changed: 0 additions & 1 deletion
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)