replace hardcoded timeouts with DestroyWaitTimeout

yfodil · yfodil · commit 5828bc7ce840 · 2025-09-08T14:49:44.000+02:00
diff --git a/internal/services/account/project_test.go b/internal/services/account/project_test.go
@@ -15,6 +15,8 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func TestAccProject_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -108,7 +110,7 @@ func isProjectDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 		ctx := context.Background()
 		api := account.NewProjectAPI(tt.Meta)
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_account_project" {
 					continue
diff --git a/internal/services/baremetal/testfuncs/checks.go b/internal/services/baremetal/testfuncs/checks.go
@@ -14,11 +14,13 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/baremetal"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func CheckServerDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_baremetal_server" {
 					continue
diff --git a/internal/services/cockpit/source_test.go b/internal/services/cockpit/source_test.go
@@ -15,6 +15,8 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/cockpit"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func TestAccCockpitSource_Basic_metrics(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -236,7 +238,7 @@ func isSourceDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_cockpit_source" {
 					continue
diff --git a/internal/services/flexibleip/ip_test.go b/internal/services/flexibleip/ip_test.go
@@ -22,6 +22,8 @@ import (
 
 const SSHKeyFlexibleIP = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7HUxRyQtB2rnlhQUcbDGCZcTJg7OvoznOiyC9W6IxH opensource@scaleway.com"
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func TestAccFlexibleIP_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -329,7 +331,7 @@ func testAccCheckFlexibleIPDestroy(tt *acctest.TestTools) resource.TestCheckFunc
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_flexible_ip" {
 					continue
diff --git a/internal/services/iam/api_key_test.go b/internal/services/iam/api_key_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -13,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam"
+	iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs"
 )
 
 func TestAccApiKey_WithApplication(t *testing.T) {
@@ -253,7 +253,7 @@ func testAccCheckIamAPIKeyDestroy(tt *acctest.TestTools) resource.TestCheckFunc
 		api := iam.NewAPI(tt.Meta)
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, iamchecks.DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range s.RootModule().Resources {
 				if rs.Type != "scaleway_iam_api_key" {
 					continue
diff --git a/internal/services/iam/application_test.go b/internal/services/iam/application_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -13,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam"
+	iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs"
 )
 
 func TestAccApplication_Basic(t *testing.T) {
@@ -115,7 +115,7 @@ func testAccCheckIamApplicationDestroy(tt *acctest.TestTools) resource.TestCheck
 		api := iam.NewAPI(tt.Meta)
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, iamchecks.DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range s.RootModule().Resources {
 				if rs.Type != "scaleway_iam_application" {
 					continue
diff --git a/internal/services/iam/group_test.go b/internal/services/iam/group_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -13,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam"
+	iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs"
 )
 
 func TestAccGroup_Basic(t *testing.T) {
@@ -484,7 +484,7 @@ func testAccCheckIamGroupDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 		api := iam.NewAPI(tt.Meta)
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, iamchecks.DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range s.RootModule().Resources {
 				if rs.Type != "scaleway_iam_group" {
 					continue
diff --git a/internal/services/iam/testfuncs/checks.go b/internal/services/iam/testfuncs/checks.go
@@ -14,12 +14,14 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func CheckSSHKeyDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		api := iam.NewAPI(tt.Meta)
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_iam_ssh_key" {
 					continue
diff --git a/internal/services/inference/testfuncs/checks.go b/internal/services/inference/testfuncs/checks.go
@@ -14,6 +14,8 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func IsDeploymentDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		for _, rs := range s.RootModule().Resources {
@@ -48,7 +50,7 @@ func IsModelDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_inference_model" {
 					continue
diff --git a/internal/services/instance/placement_group_test.go b/internal/services/instance/placement_group_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -174,7 +173,7 @@ func isPlacementGroupDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, instancechecks.DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_placement_group" {
 					continue
diff --git a/internal/services/instance/private_nic_test.go b/internal/services/instance/private_nic_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -13,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
+	instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
 )
 
 func TestAccPrivateNIC_Basic(t *testing.T) {
@@ -235,7 +235,7 @@ func isPrivateNICDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, instancechecks.DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_private_nic" {
 					continue
diff --git a/internal/services/instance/security_group_test.go b/internal/services/instance/security_group_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"sort"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -16,6 +15,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
+	instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 	"github.com/stretchr/testify/require"
 )
@@ -565,7 +565,7 @@ func isSecurityGroupDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 		api := instanceSDK.NewAPI(tt.Meta.ScwClient())
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, instancechecks.DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_security_group" {
 					continue
diff --git a/internal/services/instance/testfuncs/checks.go b/internal/services/instance/testfuncs/checks.go
@@ -19,6 +19,8 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/instancehelpers"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func CheckIPExists(tt *acctest.TestTools, name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[name]
@@ -47,7 +49,7 @@ func IsServerDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_server" {
 					continue
@@ -83,7 +85,7 @@ func IsServerRootVolumeDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 		ctx := context.Background()
 		api := instancehelpers.NewBlockAndInstanceAPI(meta.ExtractScwClient(tt.Meta))
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_server" {
 					continue
@@ -125,7 +127,7 @@ func IsIPDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_ip" {
 					continue
@@ -216,7 +218,7 @@ func IsVolumeDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 		ctx := context.Background()
 		api := instanceSDK.NewAPI(tt.Meta.ScwClient())
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_instance_volume" {
 					continue
diff --git a/internal/services/iot/hub_test.go b/internal/services/iot/hub_test.go
@@ -114,7 +114,7 @@ func isHubDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, kdestroywaittimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_iot_hub" {
 					continue
diff --git a/internal/services/ipam/testfuncs/checks.go b/internal/services/ipam/testfuncs/checks.go
@@ -14,11 +14,13 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func CheckIPDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_ipam_ip" {
 					continue
diff --git a/internal/services/k8s/cluster_test.go b/internal/services/k8s/cluster_test.go
@@ -18,6 +18,8 @@ import (
 	vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func testAccK8SClusterGetLatestK8SVersion(tt *acctest.TestTools) string {
 	api := k8sSDK.NewAPI(tt.Meta.ScwClient())
 
@@ -550,7 +552,7 @@ func testAccCheckK8SClusterDestroy(tt *acctest.TestTools) resource.TestCheckFunc
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_k8s_cluster" {
 					continue
diff --git a/internal/services/k8s/pool_test.go b/internal/services/k8s/pool_test.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -682,7 +681,7 @@ func testAccCheckK8SPoolDestroy(tt *acctest.TestTools, n string) resource.TestCh
 
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			api, region, poolID, err := k8s.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 			if err != nil {
 				return retry.NonRetryableError(err)
diff --git a/internal/services/lb/testfuncs/checks.go b/internal/services/lb/testfuncs/checks.go
@@ -17,11 +17,13 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func IsIPDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_lb_ip" {
 					continue
diff --git a/internal/services/mongodb/instance_test.go b/internal/services/mongodb/instance_test.go
@@ -16,6 +16,8 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mongodb"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func TestAccMongoDBInstance_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -502,7 +504,7 @@ func IsInstanceDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range state.RootModule().Resources {
 				if rs.Type != "scaleway_mongodb_instance" {
 					continue
diff --git a/internal/services/mongodb/user_test.go b/internal/services/mongodb/user_test.go
@@ -15,6 +15,8 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mongodb"
 )
 
+var DestroyWaitTimeout = 3 * time.Minute
+
 func TestAccMongoDBUser_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -186,7 +188,7 @@ func testAccCheckMongoDBUserDestroy(tt *acctest.TestTools) resource.TestCheckFun
 		api := mongodbSDK.NewAPI(tt.Meta.ScwClient())
 		ctx := context.Background()
 
-		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+		return retry.RetryContext(ctx, DestroyWaitTimeout, func() *retry.RetryError {
 			for _, rs := range s.RootModule().Resources {
 				if rs.Type != "scaleway_mongodb_user" {
 					continue
diff --git a/internal/services/rdb/database_backup_test.go b/internal/services/rdb/database_backup_test.go
diff --git a/internal/services/rdb/testfuncs/checks.go b/internal/services/rdb/testfuncs/checks.go
diff --git a/internal/services/redis/cluster_test.go b/internal/services/redis/cluster_test.go
diff --git a/internal/services/registry/namespace_test.go b/internal/services/registry/namespace_test.go
diff --git a/internal/services/secret/secret_test.go b/internal/services/secret/secret_test.go
diff --git a/internal/services/secret/version_test.go b/internal/services/secret/version_test.go
diff --git a/internal/services/vpc/testfuncs/checks.go b/internal/services/vpc/testfuncs/checks.go
diff --git a/internal/services/vpc/vpc_test.go b/internal/services/vpc/vpc_test.go
diff --git a/internal/services/vpcgw/testfuncs/checks.go b/internal/services/vpcgw/testfuncs/checks.go
diff --git a/internal/services/webhosting/webhosting_test.go b/internal/services/webhosting/webhosting_test.go
