test(fip): harden destroy checks with RetryContext + update cassettes

Author: yfodil

internal/services/flexibleip/ip_test.go

@@ -1,10 +1,13 @@
 package flexibleip_test
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"testing"
+	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
@@ -323,35 +326,38 @@ func testAccCheckFlexibleIPExists(tt *acctest.TestTools, name string) resource.T
 }
 
 func testAccCheckFlexibleIPDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		for _, rs := range s.RootModule().Resources {
-			if rs.Type != "scaleway_flexible_ip" {
-				continue
-			}
-
-			fipAPI, zone, id, err := flexibleip.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
-
-			_, err = fipAPI.WaitForFlexibleIP(&flexibleipSDK.WaitForFlexibleIPRequest{
-				FipID: id,
-				Zone:  zone,
-			})
-
-			// If no error resource still exist
-			if err == nil {
-				return fmt.Errorf("resource %s(%s) still exist", rs.Type, rs.Primary.ID)
+	return func(state *terraform.State) error {
+		ctx := context.Background()
+
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range state.RootModule().Resources {
+				if rs.Type != "scaleway_flexible_ip" {
+					continue
+				}
+
+				fipAPI, zone, id, err := flexibleip.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
+				if err != nil {
+					return retry.NonRetryableError(err)
+				}
+
+				_, err = fipAPI.GetFlexibleIP(&flexibleipSDK.GetFlexibleIPRequest{
+					FipID: id,
+					Zone:  zone,
+				})
+
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("flexible IP (%s) still exists", rs.Primary.ID))
+				// We check for 403 because instance API return 403 for deleted IP
+				case httperrors.Is404(err) || httperrors.Is403(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
 
-			// Unexpected api error we return it
-			// We check for 403 because instance API return 403 for deleted IP
-			if !httperrors.Is404(err) && !httperrors.Is403(err) {
-				return err
-			}
-		}
-
-		return nil
+			return nil
+		})
 	}
 }