test(vpc): harden destroy checks with RetryContext

Author: yfodil

internal/services/vpc/testfuncs/checks.go

@@ -1,8 +1,11 @@
 package vpctestfuncs
 
 import (
+	"context"
 	"fmt"
+	"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"
 	vpc2 "github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
@@ -13,34 +16,35 @@ import (
 
 func CheckPrivateNetworkDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
-		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_vpc_private_network" {
-				continue
-			}
+		ctx := context.Background()
 
-			vpcAPI, region, ID, err := vpc.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range state.RootModule().Resources {
+				if rs.Type != "scaleway_vpc_private_network" {
+					continue
+				}
 
-			_, err = vpcAPI.GetPrivateNetwork(&vpc2.GetPrivateNetworkRequest{
-				PrivateNetworkID: ID,
-				Region:           region,
-			})
+				api, region, id, err := vpc.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+				if err != nil {
+					return retry.NonRetryableError(err)
+				}
 
-			if err == nil {
-				return fmt.Errorf(
-					"VPC private network %s still exists",
-					rs.Primary.ID,
-				)
-			}
-			// Unexpected api error we return it
-			if !httperrors.Is404(err) {
-				return err
+				_, err = api.GetPrivateNetwork(&vpc2.GetPrivateNetworkRequest{
+					Region:           region,
+					PrivateNetworkID: id,
+				})
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("VPC private network (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
-		}
 
-		return nil
+			return nil
+		})
 	}
 }
 

internal/services/vpc/vpc_test.go

@@ -1,10 +1,13 @@
 package vpc_test
 
 import (
+	"context"
 	"fmt"
 	"regexp"
 	"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"
 	vpcSDK "github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
@@ -171,30 +174,32 @@ func testAccCheckVPCExists(tt *acctest.TestTools, n string) resource.TestCheckFu
 
 func testAccCheckVPCDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
-		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_vpc" {
-				continue
+		ctx := context.Background()
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range state.RootModule().Resources {
+				if rs.Type != "scaleway_vpc" {
+					continue
+				}
+
+				vpcAPI, region, id, err := vpc.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+				if err != nil {
+					return retry.NonRetryableError(err)
+				}
+
+				_, err = vpcAPI.GetVPC(&vpcSDK.GetVPCRequest{
+					Region: region,
+					VpcID:  id,
+				})
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("VPC (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
-
-			vpcAPI, region, ID, err := vpc.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
-
-			_, err = vpcAPI.GetVPC(&vpcSDK.GetVPCRequest{
-				VpcID:  ID,
-				Region: region,
-			})
-
-			if err == nil {
-				return fmt.Errorf("VPC (%s) still exists", rs.Primary.ID)
-			}
-
-			if !httperrors.Is404(err) {
-				return err
-			}
-		}
-
-		return nil
+			return nil
+		})
 	}
 }