fix(instance): rely on api for routed_ip_enabled default value

Author: Codelax

internal/services/instance/server.go

@@ -434,10 +434,6 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 
 	if ipIDs, ok := d.GetOk("ip_ids"); ok {
 		req.PublicIPs = types.ExpandSliceIDsPtr(ipIDs)
-		// If server has multiple IPs, routed ip must be enabled per default
-		if types.GetBool(d, "routed_ip_enabled") == nil {
-			req.RoutedIPEnabled = scw.BoolPtr(true)
-		}
 	}
 
 	if placementGroupID, ok := d.GetOk("placement_group_id"); ok {
@@ -623,7 +619,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
 		_ = d.Set("enable_dynamic_ip", server.DynamicIPRequired)
 		_ = d.Set("organization_id", server.Organization)
 		_ = d.Set("project_id", server.Project)
-		_ = d.Set("routed_ip_enabled", server.RoutedIPEnabled)
+		_ = d.Set("routed_ip_enabled", server.RoutedIPEnabled) //nolint:staticcheck
 
 		// Image could be empty in an import context.
 		image := regional.ExpandID(d.Get("image").(string))

internal/services/instance/server_test.go

@@ -956,38 +956,6 @@ func serverHasNewVolume(_ *acctest.TestTools, n string) resource.TestCheckFunc {
 	}
 }
 
-// bootscript are marked as deprecated
-func TestAccServer_Bootscript(t *testing.T) {
-	t.Skip("Creation of bootscript server is no longer supported")
-	tt := acctest.NewTestTools(t)
-	defer tt.Cleanup()
-	// Quick tip to get all the different bootscript:
-	// curl -sH "X-Auth-Token: $(scw config get secret-key)" https://api.scaleway.com/instance/v1/zones/fr-par-1/bootscripts | jq -r '.bootscripts[] | [.id, .architecture, .title] | @tsv'
-	bootscript := "7decf961-d3e9-4711-93c7-b16c254e99b9"
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      instancechecks.IsServerDestroyed(tt),
-		Steps: []resource.TestStep{
-			{
-				Config: fmt.Sprintf(`
-					resource "scaleway_instance_server" "base" {
-						type  = "DEV1-S"
-						image = "ubuntu_focal"
-						boot_type = "bootscript"
-						bootscript_id = "%s"
-						routed_ip_enabled = false
-					}
-				`, bootscript),
-				Check: resource.ComposeTestCheckFunc(
-					isServerPresent(tt, "scaleway_instance_server.base"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "bootscript_id", bootscript),
-				),
-			},
-		},
-	})
-}
-
 func TestAccServer_AlterTags(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()

internal/services/instance/servers_data_source.go

@@ -194,7 +194,7 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
 			rawServer["enable_ipv6"] = server.EnableIPv6 //nolint:staticcheck
 		}
 		rawServer["enable_dynamic_ip"] = server.DynamicIPRequired
-		rawServer["routed_ip_enabled"] = server.RoutedIPEnabled
+		rawServer["routed_ip_enabled"] = server.RoutedIPEnabled //nolint:staticcheck
 		rawServer["organization_id"] = server.Organization
 		rawServer["project_id"] = server.Project
 		if server.Image != nil {