feat(dhcp-reservation): add retry and timeout for gateway network (#1223)

Author: Monitob

scaleway/resource_vpc_public_gateway_dhcp_reservation.go

@@ -22,6 +22,9 @@ func resourceScalewayVPCPublicGatewayDHCPReservation() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
+		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
 			"gateway_network_id": {
@@ -83,10 +86,7 @@ func resourceScalewayVPCPublicGatewayDHCPCReservationCreate(ctx context.Context,
 	}
 
 	gatewayNetworkID := expandID(d.Get("gateway_network_id"))
-	_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
-		GatewayNetworkID: gatewayNetworkID,
-		Zone:             zone,
-	}, scw.WithContext(ctx))
+	_, err = waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, gatewayNetworkID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -103,10 +103,7 @@ func resourceScalewayVPCPublicGatewayDHCPCReservationCreate(ctx context.Context,
 
 	d.SetId(newZonedIDString(zone, res.ID))
 
-	_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
-		Zone:             zone,
-		GatewayNetworkID: gatewayNetworkID,
-	}, scw.WithContext(ctx))
+	_, err = waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, gatewayNetworkID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -157,10 +154,7 @@ func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context,
 		}
 
 		gatewayNetworkID := expandID(d.Get("gateway_network_id"))
-		_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
-			GatewayNetworkID: gatewayNetworkID,
-			Zone:             zone,
-		}, scw.WithContext(ctx))
+		_, err = waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, gatewayNetworkID, d.Timeout(schema.TimeoutUpdate))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -176,10 +170,7 @@ func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context,
 			return diag.FromErr(err)
 		}
 
-		_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
-			GatewayNetworkID: gatewayNetworkID,
-			Zone:             zone,
-		}, scw.WithContext(ctx))
+		_, err = waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, gatewayNetworkID, d.Timeout(schema.TimeoutUpdate))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -195,10 +186,7 @@ func resourceScalewayVPCPublicGatewayDHCPReservationDelete(ctx context.Context,
 	}
 
 	gatewayNetworkID := expandID(d.Get("gateway_network_id"))
-	_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
-		GatewayNetworkID: gatewayNetworkID,
-		Zone:             zone,
-	}, scw.WithContext(ctx))
+	_, err = waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, gatewayNetworkID, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -212,10 +200,7 @@ func resourceScalewayVPCPublicGatewayDHCPReservationDelete(ctx context.Context,
 		return diag.FromErr(err)
 	}
 
-	_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
-		GatewayNetworkID: gatewayNetworkID,
-		Zone:             zone,
-	}, scw.WithContext(ctx))
+	_, err = waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, gatewayNetworkID, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return diag.FromErr(err)
 	}