Fix(instance): check private network and add test case (#1043)

Author: Monitob

scaleway/helpers_instance.go

@@ -385,7 +385,10 @@ func (ph *privateNICsHandler) get(key string) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	pn := ph.privateNICsMap[id]
+	pn, ok := ph.privateNICsMap[id]
+	if !ok {
+		return nil, fmt.Errorf("could not find private network ID %s on locality %s", key, locality)
+	}
 	return map[string]interface{}{
 		"pn_id":       key,
 		"mac_address": pn.MacAddress,

scaleway/resource_instance_server_test.go

@@ -926,19 +926,47 @@ func TestAccScalewayInstanceServer_PrivateNetwork(t *testing.T) {
 		ProviderFactories: tt.ProviderFactories,
 		CheckDestroy:      testAccCheckScalewayInstanceServerDestroy(tt),
 		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_vpc_private_network internal {
+						name = "private_network_instance"
+						zone = "fr-par-2"
+					}
+
+					resource "scaleway_instance_server" "base" {
+						image = "ubuntu_focal"
+						type  = "DEV1-S"
+						zone = "fr-par-2"
+
+						private_network {
+							pn_id = scaleway_vpc_private_network.internal.id
+						}
+					}`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayInstancePrivateNICsExists(tt, "scaleway_instance_server.base"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.base", "private_network.#", "1"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_server.base", "private_network.0.pn_id"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_server.base", "private_network.0.mac_address"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_server.base", "private_network.0.status"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_server.base", "private_network.0.zone"),
+					resource.TestCheckResourceAttrPair("scaleway_instance_server.base", "private_network.0.pn_id",
+						"scaleway_vpc_private_network.internal", "id"),
+				),
+			},
 			{
 				Config: `
 					resource scaleway_vpc_private_network pn01 {
 						name = "private_network_instance"
 					}
-			
+
 					resource "scaleway_instance_server" "base" {
-					  image = "ubuntu_focal"
-					  type  = "DEV1-S"
-			
-					  private_network {
-						pn_id = scaleway_vpc_private_network.pn01.id
-					  }
+						image = "ubuntu_focal"
+						type  = "DEV1-S"
+						zone  = "fr-par-1"
+
+						private_network {
+							pn_id = scaleway_vpc_private_network.pn01.id
+						}
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstancePrivateNICsExists(tt, "scaleway_instance_server.base"),
@@ -956,18 +984,18 @@ func TestAccScalewayInstanceServer_PrivateNetwork(t *testing.T) {
 					resource scaleway_vpc_private_network pn01 {
 						name = "private_network_instance"
 					}
-			
+
 					resource scaleway_vpc_private_network pn02 {
 						name = "private_network_instance_02"
 					}
-			
+
 					resource "scaleway_instance_server" "base" {
-					  image = "ubuntu_focal"
-					  type  = "DEV1-S"
-			
-					  private_network {
-						pn_id = scaleway_vpc_private_network.pn02.id
-					  }
+						image = "ubuntu_focal"
+						type  = "DEV1-S"
+
+						private_network {
+							pn_id = scaleway_vpc_private_network.pn02.id
+						}
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstancePrivateNICsExists(tt, "scaleway_instance_server.base"),
@@ -991,16 +1019,16 @@ func TestAccScalewayInstanceServer_PrivateNetwork(t *testing.T) {
 					}
 
 					resource "scaleway_instance_server" "base" {
-					  image = "ubuntu_focal"
-					  type  = "DEV1-S"
+						image = "ubuntu_focal"
+						type  = "DEV1-S"
 
-					  private_network {
-						pn_id = scaleway_vpc_private_network.pn02.id
-					  }
+						private_network {
+							pn_id = scaleway_vpc_private_network.pn02.id
+						}
 
-					  private_network {
-						pn_id = scaleway_vpc_private_network.pn01.id
-					  }
+						private_network {
+							pn_id = scaleway_vpc_private_network.pn01.id
+						}
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstancePrivateNICsExists(tt, "scaleway_instance_server.base"),
@@ -1025,14 +1053,14 @@ func TestAccScalewayInstanceServer_PrivateNetwork(t *testing.T) {
 					resource scaleway_vpc_private_network pn01 {
 						name = "private_network_instance"
 					}
-			
+
 					resource scaleway_vpc_private_network pn02 {
 						name = "private_network_instance_02"
 					}
-			
+
 					resource "scaleway_instance_server" "base" {
-					  image = "ubuntu_focal"
-					  type  = "DEV1-S"	
+						image = "ubuntu_focal"
+						type  = "DEV1-S"	
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),