feat(pat-rules): add new test and gateway_network

Author: Monitob

scaleway/data_source_vpc_public_gateway.go

@@ -38,7 +38,7 @@ func dataSourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.Resou
 		return diag.FromErr(err)
 	}
 
-		publicGatewayID, ok := d.GetOk("public_gateway_id")
+	publicGatewayID, ok := d.GetOk("public_gateway_id")
 	if !ok {
 		res, err := vpcgwAPI.ListGateways(
 			&vpcgw.ListGatewaysRequest{

scaleway/resource_vpc_public_gateway_pat_rule.go

@@ -84,9 +84,22 @@ func resourceScalewayVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schem
 		return diag.FromErr(err)
 	}
 
+	gatewayID := expandZonedID(d.Get("gateway_id").(string)).ID
+	retryInterval := retryIntervalVPCPublicGatewayNetwork
+	//check gateway is in stable state.
+	_, err = vpcgwAPI.WaitForGateway(&vpcgw.WaitForGatewayRequest{
+		GatewayID:     gatewayID,
+		Zone:          zone,
+		Timeout:       scw.TimeDurationPtr(gatewayWaitForTimeout),
+		RetryInterval: &retryInterval,
+	}, scw.WithContext(ctx))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	req := &vpcgw.CreatePATRuleRequest{
 		Zone:        zone,
-		GatewayID:   expandZonedID(d.Get("gateway_id").(string)).ID,
+		GatewayID:   gatewayID,
 		PublicPort:  uint32(d.Get("public_port").(int)),
 		PrivateIP:   net.ParseIP(d.Get("private_ip").(string)),
 		PrivatePort: uint32(d.Get("private_port").(int)),
@@ -121,9 +134,10 @@ func resourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.
 		return diag.FromErr(err)
 	}
 
+	gatewayID := newZonedID(zone, patRules.GatewayID).String()
 	_ = d.Set("created_at", patRules.CreatedAt.Format(time.RFC3339))
 	_ = d.Set("updated_at", patRules.UpdatedAt.Format(time.RFC3339))
-	_ = d.Set("gateway_id", patRules.GatewayID)
+	_ = d.Set("gateway_id", gatewayID)
 	_ = d.Set("private_ip", patRules.PrivateIP.String())
 	_ = d.Set("private_port", patRules.PrivatePort)
 	_ = d.Set("public_port", patRules.PublicPort)
@@ -151,14 +165,15 @@ func resourceScalewayVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schem
 			PrivatePort: &privatePort,
 			Protocol:    vpcgw.PATRuleProtocol(d.Get("protocol").(string)),
 		}, scw.WithContext(ctx))
+
 		if err != nil {
 			if is404Error(err) {
 				d.SetId("")
 				return nil
 			}
 			return diag.FromErr(err)
 		}
-		}
+	}
 
 	return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, meta)
 }

scaleway/resource_vpc_public_gateway_pat_rule_test.go

@@ -43,6 +43,7 @@ func TestAccScalewayVPCPublicGatewayPATRule_Basic(t *testing.T) {
 					    gateway_id = scaleway_vpc_public_gateway.pg01.id
 					    private_network_id = scaleway_vpc_private_network.pn01.id
 					    dhcp_id = scaleway_vpc_public_gateway_dhcp.dhcp01.id
+						depends_on = [scaleway_vpc_private_network.pn01]
 					}
 
 					resource scaleway_vpc_public_gateway_pat_rule main {
@@ -51,7 +52,7 @@ func TestAccScalewayVPCPublicGatewayPATRule_Basic(t *testing.T) {
 						private_port = 42
 						public_port = 42
 						protocol = "both"
-						depends_on = [scaleway_vpc_gateway_network.gn01]
+						depends_on = [scaleway_vpc_gateway_network.gn01, scaleway_vpc_private_network.pn01]
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(