feat(instance): server: remove deprecated IP fields

Author: Mia-Cross

docs/resources/instance_server.md

@@ -227,9 +227,6 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 ~> **Important:** If this field contains local volumes, you have to first detach them, in one apply, and then delete the volume in another apply.
 
-- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server.
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
-
 - `ip_id` - (Optional) The ID of the reserved IP that is attached to the server.
 
 - `ip_ids` - (Optional) List of ID of reserved IPs that are attached to the server. Cannot be used with `ip_id`.
@@ -302,12 +299,6 @@ In addition to all arguments above, the following attributes are exported:
     - `family` - The IP address' family.
     - `dynamic` - Whether the IP is dynamic.
     - `provisioning_mode` - The provisioning mode of the IP
-- `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
-- `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
-- `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
 - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
 - `organization_id` - The organization ID the server is associated with.
 

internal/services/instance/helpers_instance.go

@@ -599,3 +599,14 @@ func DeleteASGServers(
 
 	return nil
 }
+
+// FindIPInList looks for an IP in a list to avoid using the deprecated server.PublicIP field
+func FindIPInList(ipID string, ips []*instance.ServerIP) *instance.ServerIP {
+	id := zonal.ExpandID(ipID).ID
+	for _, ip := range ips {
+		if ip.ID == id {
+			return ip
+		}
+	}
+	return nil
+}

internal/services/instance/server.go

@@ -192,25 +192,12 @@ func ResourceServer() *schema.Resource {
 				Optional:    true,
 				Description: "The additional volumes attached to the server",
 			},
-			"enable_ipv6": {
-				Type:        schema.TypeBool,
-				Optional:    true,
-				Default:     false,
-				Description: "Determines if IPv6 is enabled for the server",
-				Deprecated:  "Please use a scaleway_instance_ip with a `routed_ipv6` type",
-			},
 			"private_ip": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "The Scaleway internal IP address of the server",
 				Deprecated:  "Use ipam_ip datasource instead to fetch your server's IP in your private network.",
 			},
-			"public_ip": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "The public IPv4 address of the server",
-				Deprecated:  "Use public_ips instead",
-			},
 			"ip_id": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -229,24 +216,6 @@ func ResourceServer() *schema.Resource {
 					DiffSuppressFunc: dsf.Locality,
 				},
 			},
-			"ipv6_address": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "The default public IPv6 address routed to the server.",
-				Deprecated:  "Please use a scaleway_instance_ip with a `routed_ipv6` type",
-			},
-			"ipv6_gateway": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "The IPv6 gateway address",
-				Deprecated:  "Please use a scaleway_instance_ip with a `routed_ipv6` type",
-			},
-			"ipv6_prefix_length": {
-				Type:        schema.TypeInt,
-				Computed:    true,
-				Deprecated:  "Please use a scaleway_instance_ip with a `routed_ipv6` type",
-				Description: "The IPv6 prefix length routed to the server.",
-			},
 			"enable_dynamic_ip": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -449,21 +418,14 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 		Protected:         d.Get("protected").(bool),
 	}
 
-	enableIPv6, ok := d.GetOk("enable_ipv6")
-	if ok {
-		req.EnableIPv6 = scw.BoolPtr(enableIPv6.(bool)) //nolint:staticcheck
-	}
-
 	if bootType, ok := d.GetOk("boot_type"); ok {
 		bootType := instanceSDK.BootType(bootType.(string))
 		req.BootType = &bootType
 	}
 
 	if ipID, ok := d.GetOk("ip_id"); ok {
-		req.PublicIP = types.ExpandStringPtr(zonal.ExpandID(ipID).ID) //nolint:staticcheck
-	}
-
-	if ipIDs, ok := d.GetOk("ip_ids"); ok {
+		req.PublicIPs = &[]string{zonal.ExpandID(ipID).ID}
+	} else if ipIDs, ok := d.GetOk("ip_ids"); ok {
 		req.PublicIPs = types.ExpandSliceIDsPtr(ipIDs)
 	}
 
@@ -680,8 +642,6 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a
 	}
 
 	_ = d.Set("security_group_id", zonal.NewID(zone, server.SecurityGroup.ID).String())
-	// EnableIPv6 is deprecated
-	_ = d.Set("enable_ipv6", server.EnableIPv6) //nolint:staticcheck
 	_ = d.Set("enable_dynamic_ip", server.DynamicIPRequired)
 	_ = d.Set("organization_id", server.Organization)
 	_ = d.Set("project_id", server.Project)
@@ -702,31 +662,26 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a
 		_ = d.Set("private_ip", types.FlattenStringPtr(server.PrivateIP))
 	}
 
-	if _, hasIPID := d.GetOk("ip_id"); server.PublicIP != nil && hasIPID { //nolint:staticcheck
-		if !server.PublicIP.Dynamic { //nolint:staticcheck
-			_ = d.Set("ip_id", zonal.NewID(zone, server.PublicIP.ID).String()) //nolint:staticcheck
+	if ipID, hasIPID := d.GetOk("ip_id"); hasIPID {
+		publicIP := FindIPInList(ipID.(string), server.PublicIPs)
+		if publicIP != nil && !publicIP.Dynamic {
+			_ = d.Set("ip_id", zonal.NewID(zone, publicIP.ID).String())
 		} else {
 			_ = d.Set("ip_id", "")
 		}
 	} else {
 		_ = d.Set("ip_id", "")
 	}
 
-	if server.PublicIP != nil { //nolint:staticcheck
-		_ = d.Set("public_ip", server.PublicIP.Address.String()) //nolint:staticcheck
+	if len(server.PublicIPs) > 0 {
+		_ = d.Set("public_ips", flattenServerPublicIPs(server.Zone, server.PublicIPs))
 		d.SetConnInfo(map[string]string{
 			"type": "ssh",
-			"host": server.PublicIP.Address.String(), //nolint:staticcheck
+			"host": server.PublicIPs[0].Address.String(),
 		})
-	} else {
-		_ = d.Set("public_ip", "")
-		d.SetConnInfo(nil)
-	}
-
-	if len(server.PublicIPs) > 0 {
-		_ = d.Set("public_ips", flattenServerPublicIPs(server.Zone, server.PublicIPs))
 	} else {
 		_ = d.Set("public_ips", []any{})
+		d.SetConnInfo(nil)
 	}
 
 	if _, hasIPIDs := d.GetOk("ip_ids"); hasIPIDs {
@@ -735,22 +690,6 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a
 		_ = d.Set("ip_ids", []any{})
 	}
 
-	if server.IPv6 != nil { //nolint:staticcheck
-		_ = d.Set("ipv6_address", server.IPv6.Address.String()) //nolint:staticcheck
-		_ = d.Set("ipv6_gateway", server.IPv6.Gateway.String()) //nolint:staticcheck
-
-		prefixLength, err := strconv.Atoi(server.IPv6.Netmask) //nolint:staticcheck
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		_ = d.Set("ipv6_prefix_length", prefixLength)
-	} else {
-		_ = d.Set("ipv6_address", nil)
-		_ = d.Set("ipv6_gateway", nil)
-		_ = d.Set("ipv6_prefix_length", nil)
-	}
-
 	if server.AdminPasswordEncryptionSSHKeyID != nil {
 		_ = d.Set("admin_password_encryption_ssh_key_id", server.AdminPasswordEncryptionSSHKeyID)
 	}
@@ -973,11 +912,6 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
-	if d.HasChange("enable_ipv6") {
-		serverShouldUpdate = true
-		updateRequest.EnableIPv6 = scw.BoolPtr(d.Get("enable_ipv6").(bool))
-	}
-
 	if d.HasChange("enable_dynamic_ip") {
 		serverShouldUpdate = true
 		updateRequest.DynamicIPRequired = scw.BoolPtr(d.Get("enable_dynamic_ip").(bool))
@@ -1028,10 +962,11 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 
 		ipID := zonal.ExpandID(d.Get("ip_id")).ID
 		// If an IP is already attached, and it's not a dynamic IP we detach it.
-		if server.PublicIP != nil && !server.PublicIP.Dynamic { //nolint:staticcheck
+		publicIP := FindIPInList(ipID, server.PublicIPs)
+		if publicIP != nil && !publicIP.Dynamic {
 			_, err = api.UpdateIP(&instanceSDK.UpdateIPRequest{
 				Zone:   zone,
-				IP:     server.PublicIP.ID, //nolint:staticcheck
+				IP:     publicIP.ID,
 				Server: &instanceSDK.NullableStringValue{Null: true},
 			})
 			if err != nil {

internal/services/instance/servers_data_source.go

@@ -212,11 +212,8 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
 		rawServer := make(map[string]any)
 		rawServer["id"] = zonal.NewID(server.Zone, server.ID).String()
 
-		if server.PublicIP != nil { //nolint:staticcheck
-			rawServer["public_ip"] = server.PublicIP.Address.String() //nolint:staticcheck
-		}
-
 		if server.PublicIPs != nil {
+			rawServer["public_ip"] = server.PublicIPs[0].Address.String()
 			rawServer["public_ips"] = flattenServerPublicIPs(server.Zone, server.PublicIPs)
 		}
 

templates/resources/instance_server.md.tmpl

@@ -227,9 +227,6 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 ~> **Important:** If this field contains local volumes, you have to first detach them, in one apply, and then delete the volume in another apply.
 
-- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server.
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
-
 - `ip_id` - (Optional) The ID of the reserved IP that is attached to the server.
 
 - `ip_ids` - (Optional) List of ID of reserved IPs that are attached to the server. Cannot be used with `ip_id`.
@@ -302,12 +299,6 @@ In addition to all arguments above, the following attributes are exported:
     - `family` - The IP address' family.
     - `dynamic` - Whether the IP is dynamic.
     - `provisioning_mode` - The provisioning mode of the IP
-- `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
-- `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
-- `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
-  Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
 - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
 - `organization_id` - The organization ID the server is associated with.