fix(lb): check certificate update & lb state post destroy check (scaleway#978)

Author: Monitob

scaleway/resource_lb_certificate.go

@@ -249,29 +249,31 @@ func resourceScalewayLbCertificateUpdate(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
-	req := &lb.ZonedAPIUpdateCertificateRequest{
-		CertificateID: ID,
-		Zone:          zone,
-		Name:          d.Get("name").(string),
-	}
+	if d.HasChange("name") {
+		req := &lb.ZonedAPIUpdateCertificateRequest{
+			CertificateID: ID,
+			Zone:          zone,
+			Name:          d.Get("name").(string),
+		}
 
-	_, err = lbAPI.UpdateCertificate(req, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
-	}
+		cert, err = lbAPI.UpdateCertificate(req, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 
-	_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
-		Zone:          zone,
-		LBID:          cert.LB.ID,
-		Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
-		RetryInterval: &retryInterval,
-	}, scw.WithContext(ctx))
-	if err != nil {
-		if is403Error(err) {
-			d.SetId("")
-			return nil
+		_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
+			Zone:          zone,
+			LBID:          cert.LB.ID,
+			Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
+			RetryInterval: &retryInterval,
+		}, scw.WithContext(ctx))
+		if err != nil {
+			if is403Error(err) {
+				d.SetId("")
+				return nil
+			}
+			return diag.FromErr(err)
 		}
-		return diag.FromErr(err)
 	}
 
 	return resourceScalewayLbCertificateRead(ctx, d, meta)

scaleway/resource_lb_ip.go

@@ -238,5 +238,22 @@ func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, met
 		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 is404Error(err) || is403Error(err) {
+				d.SetId("")
+				return nil
+			}
+			return diag.FromErr(err)
+		}
+	}
+
 	return nil
 }

scaleway/resource_lb_ip_test.go

@@ -132,6 +132,20 @@ func testAccCheckScalewayLbIPDestroy(tt *TestTools) resource.TestCheckFunc {
 				return err
 			}
 
+			lbID, lbExist := rs.Primary.Attributes["lb_id"]
+			if lbExist && len(lbID) > 0 {
+				_, err = lbAPI.WaitForLb(&lb.ZonedAPIWaitForLBRequest{
+					Zone:          zone,
+					LBID:          lbID,
+					Timeout:       scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
+					RetryInterval: scw.TimeDurationPtr(DefaultWaitLBRetryInterval),
+				})
+				// Unexpected api error we return it
+				if !is404Error(err) {
+					return err
+				}
+			}
+
 			_, err = lbAPI.GetIP(&lb.ZonedAPIGetIPRequest{
 				Zone: zone,
 				IPID: ID,