test(k8s): harden destroy checks with RetryContext

Author: yfodil

internal/services/k8s/cluster_test.go

@@ -1,10 +1,13 @@
 package k8s_test
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"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"
 	k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
@@ -545,33 +548,36 @@ func TestAccCluster_TypeChange(t *testing.T) {
 
 func testAccCheckK8SClusterDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
-		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_k8s_cluster" {
-				continue
+		ctx := context.Background()
+
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range state.RootModule().Resources {
+				if rs.Type != "scaleway_k8s_cluster" {
+					continue
+				}
+
+				api, region, clusterID, err := k8s.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+				if err != nil {
+					return retry.NonRetryableError(err)
+				}
+
+				_, err = api.GetCluster(&k8sSDK.GetClusterRequest{
+					Region:    region,
+					ClusterID: clusterID,
+				})
+
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("k8s cluster (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
 
-			k8sAPI, region, clusterID, err := k8s.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
-
-			_, err = k8sAPI.WaitForCluster(&k8sSDK.WaitForClusterRequest{
-				Region:    region,
-				ClusterID: clusterID,
-			})
-
-			// If no error resource still exist
-			if err == nil {
-				return fmt.Errorf("cluster (%s) still exists", rs.Primary.ID)
-			}
-
-			// Unexpected api error we return it
-			if !httperrors.Is404(err) {
-				return err
-			}
-		}
-
-		return nil
+			return nil
+		})
 	}
 }
 

internal/services/k8s/pool_test.go

@@ -1,11 +1,14 @@
 package k8s_test
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
 	"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"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
@@ -677,25 +680,28 @@ func testAccCheckK8SPoolDestroy(tt *acctest.TestTools, n string) resource.TestCh
 			return nil
 		}
 
-		k8sAPI, region, poolID, err := k8s.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
-		if err != nil {
-			return err
-		}
+		ctx := context.Background()
 
-		_, err = k8sAPI.WaitForPool(&k8sSDK.WaitForPoolRequest{
-			Region: region,
-			PoolID: poolID,
-		})
-		// If no error resource still exist
-		if err == nil {
-			return fmt.Errorf("pool (%s) still exists", rs.Primary.ID)
-		}
-		// Unexpected api error we return it
-		if !httperrors.Is404(err) {
-			return err
-		}
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			api, region, poolID, err := k8s.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+			if err != nil {
+				return retry.NonRetryableError(err)
+			}
 
-		return nil
+			_, err = api.GetPool(&k8sSDK.GetPoolRequest{
+				Region: region,
+				PoolID: poolID,
+			})
+
+			switch {
+			case err == nil:
+				return retry.RetryableError(fmt.Errorf("k8s pool (%s) still exists", rs.Primary.ID))
+			case httperrors.Is404(err):
+				return nil
+			default:
+				return retry.NonRetryableError(err)
+			}
+		})
 	}
 }