add waiter terminal state vpc_enable

Author: Laure-di

internal/services/applesilicon/server.go

@@ -266,6 +266,11 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
+	_, err = waitForAppleSiliconPrivateNetworkServer(ctx, appleSilisonPrivateNetworkAPI, zone, ID, d.Timeout(schema.TimeoutCreate))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	if d.HasChange("private_network") && *req.EnableVpc {
 		privateNetwork := d.Get("private_network")
 		req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{

internal/services/applesilicon/server_test.go

@@ -142,24 +142,34 @@ func TestAccServer_EnableVPC(t *testing.T) {
 			},
 			{
 				Config: `
-							resource scaleway_apple_silicon_server main {
-								name = "TestAccServerEnableVPC"
-								type = "M2-M"
-								enable_vpc = false
-							}
-						`,
+					resource "scaleway_vpc" "vpc02" {
+					  name = "TestAccServerEnableVPCTwo"
+					}
+					
+					resource "scaleway_vpc_private_network" "pn02" {
+					  name = "TestAccServerEnableVPCNumbertwo"
+					  vpc_id = scaleway_vpc.vpc02.id
+					}
+
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableVPC"
+						type = "M2-M"
+						enable_vpc = true
+						private_network {
+						  id = scaleway_vpc_private_network.pn02.id
+						}
+					}
+				`,
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_apple_silicon_server.main"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableVPC"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
-					resource.TestCheckNoResourceAttr("scaleway_apple_silicon_server.main", "private_network"),
 					// 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_updating"),
-					resource.TestCheckNoResourceAttr("scaleway_apple_silicon_server.main", "vpc_id"),
 				),
 			},
 		},

internal/services/applesilicon/waiters.go

@@ -45,3 +45,17 @@ func waitForAppleSiliconPrivateNetworkServer(ctx context.Context, api *applesili
 
 	return privateNetwork, err
 }
+
+func waitForTerminalVPCState(ctx context.Context, api *applesilicon.API, zone scw.Zone, serverID string, timeout time.Duration) {
+	retryInterval := defaultAppleSiliconServerRetryInterval
+	if transport.DefaultWaitRetryInterval != nil {
+		retryInterval = *transport.DefaultWaitRetryInterval
+	}
+
+	_ = api.WaitForServerVPCOptionTerminalState(&applesilicon.WaitForServerRequest{
+		ServerID:      serverID,
+		Zone:          zone,
+		Timeout:       scw.TimeDurationPtr(timeout),
+		RetryInterval: &retryInterval,
+	}, scw.WithContext(ctx))
+}