From ff1b61941d1c3d2714467836e88db812278bbd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 7 Jan 2021 12:30:00 +0100 Subject: [PATCH 1/2] fix(instance): fix default for delete_on_termination --- scaleway/resource_instance_server.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scaleway/resource_instance_server.go b/scaleway/resource_instance_server.go index a5c8e98fef..2e8d19b57c 100644 --- a/scaleway/resource_instance_server.go +++ b/scaleway/resource_instance_server.go @@ -470,7 +470,13 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD rootVolume["volume_id"] = newZonedID(zone, volume.ID).String() rootVolume["size_in_gb"] = int(uint64(volume.Size) / gb) - rootVolume["delete_on_termination"] = d.Get("root_volume.0.delete_on_termination") + + // By default we delete the root volume on termination + rootVolume["delete_on_termination"] = true + deleteOnTermination, deleteOnTerminationSpecified := d.GetOk("root_volume.0.delete_on_termination") + if deleteOnTerminationSpecified { + rootVolume["delete_on_termination"] = deleteOnTermination + } _ = d.Set("root_volume", []map[string]interface{}{rootVolume}) } else { From 0aaeb11e9247e58ad2507c9d3ec80738f1c8a68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 7 Jan 2021 14:04:42 +0100 Subject: [PATCH 2/2] Update scaleway/resource_instance_server.go Co-authored-by: Olivier Cano --- scaleway/resource_instance_server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scaleway/resource_instance_server.go b/scaleway/resource_instance_server.go index 2e8d19b57c..e50351ea89 100644 --- a/scaleway/resource_instance_server.go +++ b/scaleway/resource_instance_server.go @@ -473,8 +473,7 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD // By default we delete the root volume on termination rootVolume["delete_on_termination"] = true - deleteOnTermination, deleteOnTerminationSpecified := d.GetOk("root_volume.0.delete_on_termination") - if deleteOnTerminationSpecified { + if deleteOnTermination, ok := d.GetOk("root_volume.0.delete_on_termination"); ok { rootVolume["delete_on_termination"] = deleteOnTermination }