remove private_ip + rework IP updates

Author: Mia-Cross

internal/services/instance/server.go

@@ -192,12 +192,6 @@ func ResourceServer() *schema.Resource {
 				Optional:    true,
 				Description: "The additional volumes attached to the server",
 			},
-			"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.",
-			},
 			"ip_id": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -658,10 +652,6 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a
 		_ = d.Set("placement_group_policy_respected", server.PlacementGroup.PolicyRespected)
 	}
 
-	if server.PrivateIP != nil {
-		_ = d.Set("private_ip", types.FlattenStringPtr(server.PrivateIP))
-	}
-
 	if ipID, hasIPID := d.GetOk("ip_id"); hasIPID {
 		publicIP := FindIPInList(ipID.(string), server.PublicIPs)
 		if publicIP != nil && !publicIP.Dynamic {
@@ -956,54 +946,21 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 	// Update reserved IP
 	////
 	if d.HasChange("ip_id") && !instanceIPHasMigrated(d) {
-		server, err := waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate))
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
 		ipID := zonal.ExpandID(d.Get("ip_id")).ID
-		// If an IP is already attached, and it's not a dynamic IP we detach it.
-		publicIP := FindIPInList(ipID, server.PublicIPs)
-		if publicIP != nil && !publicIP.Dynamic {
-			_, err = api.UpdateIP(&instanceSDK.UpdateIPRequest{
-				Zone:   zone,
-				IP:     publicIP.ID,
-				Server: &instanceSDK.NullableStringValue{Null: true},
-			})
-			if err != nil {
-				return diag.FromErr(err)
-			}
-			// we wait to ensure to not detach the new ip.
-			_, err := waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate))
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-		// If a new IP is provided, we attach it to the server
-		if ipID != "" {
-			_, err := waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate))
-			if err != nil {
-				return diag.FromErr(err)
-			}
-
-			_, err = api.UpdateIP(&instanceSDK.UpdateIPRequest{
-				Zone:   zone,
-				IP:     ipID,
-				Server: &instanceSDK.NullableStringValue{Value: id},
-			}, scw.WithContext(ctx))
-			if err != nil {
-				return diag.FromErr(err)
-			}
-
-			_, err = waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate))
+		if ipID == "" {
+			emptyIPList := make([]string, 0)
+			updateRequest.PublicIPs = &emptyIPList
+			serverShouldUpdate = true
+		} else {
+			err := ResourceInstanceServerUpdateIPs(ctx, d, api.API, zone, id, "ip_id")
 			if err != nil {
 				return diag.FromErr(err)
 			}
 		}
 	}
 
 	if d.HasChange("ip_ids") {
-		err := ResourceInstanceServerUpdateIPs(ctx, d, api.API, zone, id)
+		err := ResourceInstanceServerUpdateIPs(ctx, d, api.API, zone, id, "ip_ids")
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -1418,13 +1375,20 @@ func ResourceInstanceServerMigrate(ctx context.Context, d *schema.ResourceData,
 	return nil
 }
 
-func ResourceInstanceServerUpdateIPs(ctx context.Context, d *schema.ResourceData, instanceAPI *instanceSDK.API, zone scw.Zone, id string) error {
+func ResourceInstanceServerUpdateIPs(ctx context.Context, d *schema.ResourceData, instanceAPI *instanceSDK.API, zone scw.Zone, id string, attribute string) error {
 	server, err := waitForServer(ctx, instanceAPI, zone, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		return err
 	}
 
-	schemaIPs := d.Get("ip_ids").([]any)
+	var schemaIPs []any
+	switch attribute {
+	case "ip_id":
+		schemaIP := d.Get(attribute).(string)
+		schemaIPs = append(schemaIPs, schemaIP)
+	case "ip_ids":
+		schemaIPs = d.Get(attribute).([]any)
+	}
 	requestedIPs := make(map[string]bool, len(schemaIPs))
 
 	// Gather request IPs in a map