Merge pull request #31047 from AdamTylerLynch/b-rds_status_types_dele…

…te_precheck Added new delete-precheck status for RDS
hashicorp · Apr 28, 2023 · 486e9a1 · 486e9a1
2 parents 9c78cbd + 4286f64
commit 486e9a1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/.changelog/31047.txt b/.changelog/31047.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_db_instance: Consider `delete-precheck` a valid pending state for resource deletion
+```
+
+```release-note:bug
+resource/aws_rds_cluster_instance: Consider `delete-precheck` a valid pending state for resource deletion
+```
diff --git a/internal/service/rds/consts.go b/internal/service/rds/consts.go
@@ -64,6 +64,7 @@ const (
 	InstanceStatusConfiguringLogExports                        = "configuring-log-exports"
 	InstanceStatusConvertingToVPC                              = "converting-to-vpc"
 	InstanceStatusCreating                                     = "creating"
+	InstanceStatusDeletePreCheck                               = "delete-precheck"
 	InstanceStatusDeleting                                     = "deleting"
 	InstanceStatusFailed                                       = "failed"
 	InstanceStatusInaccessibleEncryptionCredentials            = "inaccessible-encryption-credentials"

diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go
@@ -2487,6 +2487,7 @@ func waitDBInstanceDeleted(ctx context.Context, conn *rds.RDS, id string, timeou
 			InstanceStatusConfiguringEnhancedMonitoring,
 			InstanceStatusConfiguringLogExports,
 			InstanceStatusCreating,
+			InstanceStatusDeletePreCheck,
 			InstanceStatusDeleting,
 			InstanceStatusIncompatibleParameters,
 			InstanceStatusIncompatibleRestore,

diff --git a/internal/service/rds/wait.go b/internal/service/rds/wait.go
@@ -215,6 +215,7 @@ func waitDBClusterInstanceDeleted(ctx context.Context, conn *rds.RDS, id string,
 	stateConf := &retry.StateChangeConf{
 		Pending: []string{
 			InstanceStatusConfiguringLogExports,
+			InstanceStatusDeletePreCheck,
 			InstanceStatusDeleting,
 			InstanceStatusModifying,
 		},