manage updating vpc enable update

Author: Laure-di

internal/services/applesilicon/server.go

@@ -262,9 +262,13 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		req.EnableVpc = &enableVpc
 	}
 
+	_, err = asAPI.UpdateServer(req, scw.WithContext(ctx))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	if d.HasChange("private_network") && *req.EnableVpc {
 		privateNetwork := d.Get("private_network")
-
 		req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{
 			Zone:                       zone,
 			ServerID:                   ID,
@@ -279,11 +283,6 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		_, err = waitForAppleSiliconPrivateNetworkServer(ctx, appleSilisonPrivateNetworkAPI, zone, ID, d.Timeout(schema.TimeoutCreate))
 	}
 
-	_, err = asAPI.UpdateServer(req, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
 	return ResourceAppleSiliconServerRead(ctx, d, m)
 }
 

internal/services/applesilicon/server_test.go

@@ -44,6 +44,61 @@ func TestAccServer_Basic(t *testing.T) {
 	})
 }
 
+func TestAccServer_EnableDisabledVPC(t *testing.T) {
+	//t.Skip("Skipping AppleSilicon VPC not available")
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      isServerDestroyed(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableVPC"
+						type = "M2-M"
+						enable_vpc = true
+					}
+				`,
+				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"),
+					// 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_enabled"),
+				),
+			},
+			{
+				Config: `
+
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableVPC"
+						type = "M2-M"
+						enable_vpc = false
+					}
+				`,
+				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"),
+					// 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"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccServer_EnableVPC(t *testing.T) {
 	//t.Skip("Skipping AppleSilicon VPC not available")
 	tt := acctest.NewTestTools(t)
@@ -61,9 +116,6 @@ func TestAccServer_EnableVPC(t *testing.T) {
 					
 					resource "scaleway_vpc_private_network" "pn01" {
 					  name = "TestAccServerEnableVPC"
-					  ipv4_subnet {
-						subnet = "172.16.64.0/22"
-					  }
 					  vpc_id = scaleway_vpc.vpc01.id
 					}
 
@@ -91,24 +143,22 @@ func TestAccServer_EnableVPC(t *testing.T) {
 			},
 			{
 				Config: `
-							resource scaleway_apple_silicon_server main {
-								name = "TestAccServerEnableVPC"
-								type = "M2-M"
-								enable_vpc = false
-							}
-						`,
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableVPC"
+						type = "M2-M"
+						enable_vpc = false
+					}
+				`,
 				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"),
 				),
 			},
 		},