test(iam): harden destroy checks with RetryContext

Author: yfodil

internal/services/iam/api_key_test.go

@@ -1,9 +1,12 @@
 package iam_test
 
 import (
+	"context"
 	"fmt"
 	"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"
 	iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
@@ -247,28 +250,30 @@ func testAccCheckIamAPIKeyExists(tt *acctest.TestTools, name string) resource.Te
 
 func testAccCheckIamAPIKeyDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		for _, rs := range s.RootModule().Resources {
-			if rs.Type != "scaleway_iam_api_key" {
-				continue
-			}
-
-			iamAPI := iam.NewAPI(tt.Meta)
+		api := iam.NewAPI(tt.Meta)
+		ctx := context.Background()
 
-			_, err := iamAPI.GetAPIKey(&iamSDK.GetAPIKeyRequest{
-				AccessKey: rs.Primary.ID,
-			})
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range s.RootModule().Resources {
+				if rs.Type != "scaleway_iam_api_key" {
+					continue
+				}
 
-			// If no error resource still exist
-			if err == nil {
-				return fmt.Errorf("resource %s(%s) still exist", rs.Type, rs.Primary.ID)
-			}
+				_, err := api.GetAPIKey(&iamSDK.GetAPIKeyRequest{
+					AccessKey: rs.Primary.ID,
+				})
 
-			// Unexpected api error we return it
-			if !httperrors.Is404(err) {
-				return err
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("IAM API key (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
-		}
 
-		return nil
+			return nil
+		})
 	}
 }

internal/services/iam/application_test.go

@@ -1,9 +1,12 @@
 package iam_test
 
 import (
+	"context"
 	"fmt"
 	"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"
 	iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
@@ -109,28 +112,30 @@ func testAccCheckIamApplicationExists(tt *acctest.TestTools, name string) resour
 
 func testAccCheckIamApplicationDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		for _, rs := range s.RootModule().Resources {
-			if rs.Type != "scaleway_iam_application" {
-				continue
-			}
-
-			iamAPI := iam.NewAPI(tt.Meta)
+		api := iam.NewAPI(tt.Meta)
+		ctx := context.Background()
 
-			_, err := iamAPI.GetApplication(&iamSDK.GetApplicationRequest{
-				ApplicationID: rs.Primary.ID,
-			})
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range s.RootModule().Resources {
+				if rs.Type != "scaleway_iam_application" {
+					continue
+				}
 
-			// If no error resource still exist
-			if err == nil {
-				return fmt.Errorf("resource %s(%s) still exist", rs.Type, rs.Primary.ID)
-			}
+				_, err := api.GetApplication(&iamSDK.GetApplicationRequest{
+					ApplicationID: rs.Primary.ID,
+				})
 
-			// Unexpected api error we return it
-			if !httperrors.Is404(err) {
-				return err
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("IAM application (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
-		}
 
-		return nil
+			return nil
+		})
 	}
 }

internal/services/iam/group_test.go

@@ -1,9 +1,12 @@
 package iam_test
 
 import (
+	"context"
 	"fmt"
 	"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"
 	iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
@@ -478,28 +481,30 @@ func testAccCheckIamGroupExists(tt *acctest.TestTools, name string) resource.Tes
 
 func testAccCheckIamGroupDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		for _, rs := range s.RootModule().Resources {
-			if rs.Type != "scaleway_iam_group" {
-				continue
-			}
-
-			iamAPI := iam.NewAPI(tt.Meta)
+		api := iam.NewAPI(tt.Meta)
+		ctx := context.Background()
 
-			_, err := iamAPI.GetGroup(&iamSDK.GetGroupRequest{
-				GroupID: rs.Primary.ID,
-			})
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range s.RootModule().Resources {
+				if rs.Type != "scaleway_iam_group" {
+					continue
+				}
 
-			// If no error resource still exist
-			if err == nil {
-				return fmt.Errorf("resource %s(%s) still exist", rs.Type, rs.Primary.ID)
-			}
+				_, err := api.GetGroup(&iamSDK.GetGroupRequest{
+					GroupID: rs.Primary.ID,
+				})
 
-			// Unexpected api error we return it
-			if !httperrors.Is404(err) {
-				return err
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("IAM group (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
-		}
 
-		return nil
+			return nil
+		})
 	}
 }