fix part of tests

Author: Laure-di

internal/services/applesilicon/server.go

@@ -262,7 +262,7 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		req.EnableVpc = &enableVpc
 	}
 
-	if d.HasChange("private_network") {
+	if d.HasChange("private_network") && *req.EnableVpc {
 		privateNetwork := d.Get("private_network")
 
 		req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{

internal/services/applesilicon/server_test.go

@@ -25,13 +25,13 @@ func TestAccServer_Basic(t *testing.T) {
 			{
 				Config: `
 					resource scaleway_apple_silicon_server main {
-						name = "test-m2"
+						name = "TestAccServerBasic"
 						type = "M2-M"
 					}
 				`,
 				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", "name", "TestAccServerBasic"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
 					// Computed
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
@@ -56,61 +56,52 @@ func TestAccServer_EnableVPC(t *testing.T) {
 			{
 				Config: `
 					resource "scaleway_vpc" "vpc01" {
-					  name = "TestAccServer_EnableVPC"
+					  name = "TestAccServerEnableVPC"
 					}
 					
 					resource "scaleway_vpc_private_network" "pn01" {
-					  name = "TestAccServer_EnableVPC"
+					  name = "TestAccServerEnableVPC"
 					  ipv4_subnet {
 						subnet = "172.16.64.0/22"
 					  }
 					  vpc_id = scaleway_vpc.vpc01.id
 					}
-					
-					resource "scaleway_ipam_ip" "ip01" {
-					  address = "172.16.64.7"
-					  source {
-						private_network_id = scaleway_vpc_private_network.pn01.id
-					  }
-					}
-
-					resource "scaleway_ipam_ip" "ip02" {
-					  address = "172.16.64.9"
-					  source {
-						private_network_id = scaleway_vpc_private_network.pn01.id
-					  }
-					}
 
 					resource scaleway_apple_silicon_server main {
-						name = "test-m2"
+						name = "TestAccServerEnableVPC"
 						type = "M2-M"
 						enable_vpc = true
+						private_network {
+						  id = scaleway_vpc_private_network.pn01.id
+						}
 					}
 				`,
 				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", "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.TestCheckResourceAttrPair("scaleway_apple_silicon_server.main", "private_network.0.id", "scaleway_vpc_private_network.pn01", "id"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_enabled"),
 				),
 			},
 			{
 				Config: `
-					resource scaleway_apple_silicon_server main {
-						name = "test-m2"
-						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", "test-m2"),
+					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"),