fix(lb): fix ip waiting status during deletion (scaleway#977)

Author: Monitob

scaleway/resource_lb.go

@@ -368,7 +368,7 @@ func resourceScalewayLbDelete(ctx context.Context, d *schema.ResourceData, meta
 		Timeout:       scw.TimeDurationPtr(LbWaitForTimeout),
 		RetryInterval: &retryInterval,
 	}, scw.WithContext(ctx))
-	if err != nil && !is404Error(err) {
+	if err != nil {
 		return diag.FromErr(err)
 	}
 

scaleway/resource_lb_ip.go

@@ -92,6 +92,23 @@ func resourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta
 		return diag.FromErr(err)
 	}
 
+	// check lb state if it is attached
+	if res.LBID != nil {
+		_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
+			Zone:          zone,
+			LBID:          *res.LBID,
+			Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
+			RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			if is403Error(err) {
+				d.SetId("")
+				return nil
+			}
+			return diag.FromErr(err)
+		}
+	}
+
 	// set the region from zone
 	region, err := zone.Region()
 	if err != nil {
@@ -115,6 +132,35 @@ func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, met
 		return diag.FromErr(err)
 	}
 
+	res, err := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
+		Zone: zone,
+		IPID: ID,
+	}, scw.WithContext(ctx))
+
+	if err != nil {
+		if is404Error(err) || is403Error(err) {
+			d.SetId("")
+			return nil
+		}
+		return diag.FromErr(err)
+	}
+
+	if res.LBID != nil {
+		_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
+			Zone:          zone,
+			LBID:          *res.LBID,
+			Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
+			RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			if is403Error(err) {
+				d.SetId("")
+				return nil
+			}
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("reverse") {
 		req := &lb.ZonedAPIUpdateIPRequest{
 			Zone:    zone,
@@ -128,6 +174,22 @@ func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, met
 		}
 	}
 
+	if res.LBID != nil {
+		_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
+			Zone:          zone,
+			LBID:          *res.LBID,
+			Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
+			RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			if is403Error(err) {
+				d.SetId("")
+				return nil
+			}
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceScalewayLbIPRead(ctx, d, meta)
 }
 
@@ -137,6 +199,36 @@ func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, met
 		return diag.FromErr(err)
 	}
 
+	res, err := lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
+		Zone: zone,
+		IPID: ID,
+	}, scw.WithContext(ctx))
+
+	if err != nil {
+		if is404Error(err) || is403Error(err) {
+			d.SetId("")
+			return nil
+		}
+		return diag.FromErr(err)
+	}
+
+	// check lb state
+	if res.LBID != nil {
+		_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
+			Zone:          zone,
+			LBID:          *res.LBID,
+			Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
+			RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			if is403Error(err) {
+				d.SetId("")
+				return nil
+			}
+			return diag.FromErr(err)
+		}
+	}
+
 	err = lbAPI.ReleaseIP(&lb.ZonedAPIReleaseIPRequest{
 		Zone: zone,
 		IPID: ID,

scaleway/resource_lb_ip_test.go

@@ -73,6 +73,24 @@ func TestAccScalewayLbIP_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_lb_ip.ip01", "reverse", "myreverse.com"),
 				),
 			},
+			{
+				Config: `
+					resource scaleway_lb_ip ip01 {
+						reverse = "myreverse.com"
+					}
+
+					resource scaleway_lb main {
+					    ip_id = scaleway_lb_ip.ip01.id
+						name = "test-lb-with-release-ip"
+						type = "LB-S"
+						release_ip = true
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayLbExists(tt, "scaleway_lb.main"),
+					testAccCheckScalewayLbIPExists(tt, "scaleway_lb_ip.ip01"),
+				),
+			},
 		},
 	})
 }