tests

Author: Laure-di

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.7.3
 	github.com/nats-io/nats.go v1.37.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31.0.20250128135513-ad2f1fb6c4b9
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31.0.20250129134826-04caf0452484
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.31.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -288,6 +288,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31 h1:Fj7jPyu9TQjqfXcLylINK5PANS
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31.0.20250128135513-ad2f1fb6c4b9 h1:qvgJcZjBgpQ6AkNA4yBtYKa9QJ4a0MME603X+Fe81Sg=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31.0.20250128135513-ad2f1fb6c4b9/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31.0.20250129134826-04caf0452484 h1:CQNllJ4XCELHD64WYXHh0ytdJYr0DAEcr0GkvAQfds4=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31.0.20250129134826-04caf0452484/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=

internal/services/applesilicon/clients.go

@@ -29,3 +29,13 @@ func NewAPIWithZoneAndID(m interface{}, id string) (*applesilicon.API, scw.Zone,
 	}
 	return asAPI, zone, ID, nil
 }
+
+func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*applesilicon.PrivateNetworkAPI, scw.Zone, error) {
+	privateNetworkAPI := applesilicon.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
+
+	zone, err := meta.ExtractZone(d, m)
+	if err != nil {
+		return nil, "", err
+	}
+	return privateNetworkAPI, zone, nil
+}

internal/services/applesilicon/helpers.go

@@ -0,0 +1,40 @@
+package applesilicon
+
+import (
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
+)
+
+func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceData, m interface{}, serverID string) error {
+	privateNetworkAPI, zone, err := newPrivateNetworkAPIWithZone(d, m)
+	if err != nil {
+		return err
+	}
+	listPrivateNetwork, err := privateNetworkAPI.ListServerPrivateNetworks(&applesilicon.PrivateNetworkAPIListServerPrivateNetworksRequest{
+		Zone:     zone,
+		ServerID: &serverID,
+	}, scw.WithContext(ctx))
+	if err != nil {
+		return err
+	}
+
+	for _, pn := range listPrivateNetwork.ServerPrivateNetworks {
+		err := privateNetworkAPI.DeleteServerPrivateNetwork(&applesilicon.PrivateNetworkAPIDeleteServerPrivateNetworkRequest{
+			Zone:             zone,
+			ServerID:         serverID,
+			PrivateNetworkID: pn.PrivateNetworkID,
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return err
+		}
+	}
+
+	_, err = waitForAppleSiliconPrivateNetworkServer(ctx, privateNetworkAPI, zone, serverID, d.Timeout(schema.TimeoutDelete))
+	if err != nil && !httperrors.Is404(err) {
+		return err
+	}
+	return nil
+}

internal/services/applesilicon/server.go

@@ -241,6 +241,11 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
+	appleSilisonPrivateNetworkAPI, zone, err := newPrivateNetworkAPIWithZone(d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	req := &applesilicon.UpdateServerRequest{
 		Zone:     zone,
 		ServerID: ID,
@@ -255,6 +260,23 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		req.EnableVpc = &enableVpc
 	}
 
+	if d.HasChange("private_network") {
+		privateNetwork := d.Get("private_network")
+
+		req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{
+			Zone:                       zone,
+			ServerID:                   ID,
+			PerPrivateNetworkIpamIPIDs: expandPrivateNetworks(privateNetwork),
+		}
+
+		_, err := appleSilisonPrivateNetworkAPI.SetServerPrivateNetworks(req, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		_, err = waitForAppleSiliconPrivateNetworkServer(ctx, appleSilisonPrivateNetworkAPI, zone, ID, d.Timeout(schema.TimeoutCreate))
+	}
+
 	_, err = asAPI.UpdateServer(req, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
@@ -269,6 +291,11 @@ func ResourceAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
+	err = detachAllPrivateNetworkFromServer(ctx, d, m, ID)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	err = asAPI.DeleteServer(&applesilicon.DeleteServerRequest{
 		Zone:     zone,
 		ServerID: ID,

internal/services/applesilicon/server_test.go

@@ -24,13 +24,13 @@ func TestAccServer_Basic(t *testing.T) {
 			{
 				Config: `
 					resource scaleway_apple_silicon_server main {
-						name = "test-m1"
+						name = "test-m2"
 						type = "M2-M"
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_apple_silicon_server.main"),
-					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m1"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m2"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
 					// Computed
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
@@ -55,11 +55,11 @@ func TestAccServer_EnableVPC(t *testing.T) {
 			{
 				Config: `
 					resource "scaleway_vpc" "vpc01" {
-					  name = "TestAccScalewayBaremetalIPAM"
+					  name = "TestAccServer_EnableVPC"
 					}
 					
 					resource "scaleway_vpc_private_network" "pn01" {
-					  name = "TestAccScalewayBaremetalIPAM"
+					  name = "TestAccServer_EnableVPC"
 					  ipv4_subnet {
 						subnet = "172.16.64.0/22"
 					  }
@@ -84,10 +84,6 @@ func TestAccServer_EnableVPC(t *testing.T) {
 						name = "test-m2"
 						type = "M2-M"
 						enable_vpc = true
-						private_network {
-						  id = scaleway_vpc_private_network.pn01.id
-						  ipam_ip_ids = [scaleway_ipam_ip.ip01.id]
-						}
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
@@ -113,13 +109,14 @@ func TestAccServer_EnableVPC(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_apple_silicon_server.main"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m2"),
-					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M1-M"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
 					// Computed
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "created_at"),
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "deletable_at"),
-					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_disabled"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_updating"),
+					resource.TestCheckNoResourceAttr("scaleway_apple_silicon_server.main", "vpc_id"),
 				),
 			},
 		},