fix

Author: yfodil

internal/services/instance/private_nic_test.go

@@ -261,7 +261,7 @@ func isPrivateNICDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 					return retry.NonRetryableError(err)
 				}
 			}
-			
+
 			return nil
 		})
 	}

internal/services/rdb/database_backup_test.go

@@ -1,9 +1,12 @@
 package rdb_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"
 	rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
@@ -113,33 +116,36 @@ func TestAccDatabaseBackup_Basic(t *testing.T) {
 
 func isBackupDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
-		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_rdb_database_backup" {
-				continue
+		ctx := context.Background()
+
+		return retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError {
+			for _, rs := range state.RootModule().Resources {
+				if rs.Type != "scaleway_rdb_database_backup" {
+					continue
+				}
+
+				api, region, id, err := rdb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+				if err != nil {
+					return retry.NonRetryableError(err)
+				}
+
+				_, err = api.GetDatabaseBackup(&rdbSDK.GetDatabaseBackupRequest{
+					DatabaseBackupID: id,
+					Region:           region,
+				})
+
+				switch {
+				case err == nil:
+					return retry.RetryableError(fmt.Errorf("backup (%s) still exists", rs.Primary.ID))
+				case httperrors.Is404(err):
+					continue
+				default:
+					return retry.NonRetryableError(err)
+				}
 			}
 
-			rdbAPI, region, ID, err := rdb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
-
-			_, err = rdbAPI.GetDatabaseBackup(&rdbSDK.GetDatabaseBackupRequest{
-				DatabaseBackupID: ID,
-				Region:           region,
-			})
-
-			// If no error resource still exist
-			if err == nil {
-				return fmt.Errorf("backup (%s) still exists", rs.Primary.ID)
-			}
-
-			// Unexpected api error we return it
-			if !httperrors.Is404(err) {
-				return err
-			}
-		}
-
-		return nil
+			return nil
+		})
 	}
 }
 

internal/services/rdb/testdata/data-source-database-backup-basic.cassette.yaml

@@ -332,17 +332,18 @@ func testAccCheckSecretDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
 					return retry.NonRetryableError(err)
 				}
 
-				_, err = api.GetSecret(&secretSDK.GetSecretRequest{
+				sec, err := api.GetSecret(&secretSDK.GetSecretRequest{
 					SecretID: id,
 					Region:   region,
 				})
 
 				switch {
-				case err == nil:
-					return retry.RetryableError(fmt.Errorf("secret (%s) still exists", rs.Primary.ID))
+				case err == nil && sec != nil && sec.DeletionRequestedAt != nil:
+					// Soft-deleted (scheduled for deletion), treat as destroyed for tests
+					continue
 				case httperrors.Is404(err):
 					continue
-				default:
+				case err != nil:
 					return retry.NonRetryableError(err)
 				}
 			}