Skip to content

rds: Remove delays and ContinuousTargetOccurence from DB instance operations #45480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
berimbolo13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

rds: Remove delays and ContinuousTargetOccurence from DB instance operations #45480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/44925.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_db_instance: Remove hardcoded delays and continuous target occurrence checks before polling instance state during creation, stop, and deletion operations
```
18 changes: 6 additions & 12 deletions internal/service/rds/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2890,9 +2890,7 @@ func statusDBInstance(conn *rds.Client, id string, optFns ...func(*rds.Options))

func waitDBInstanceAvailable(ctx context.Context, conn *rds.Client, id string, timeout time.Duration, optFns ...tfresource.OptionsFunc) (*types.DBInstance, error) {
options := tfresource.Options{
PollInterval: 10 * time.Second,
Delay: 1 * time.Minute,
ContinuousTargetOccurence: 3,
PollInterval: 10 * time.Second,
}
for _, fn := range optFns {
fn(&options)
Expand Down Expand Up @@ -2952,12 +2950,10 @@ func waitDBInstanceStopped(ctx context.Context, conn *rds.Client, id string, tim
instanceStatusStorageFull,
instanceStatusUpgrading,
},
Target: []string{instanceStatusStopped},
Refresh: statusDBInstance(conn, id),
Timeout: timeout,
ContinuousTargetOccurence: 2,
Delay: 10 * time.Second,
MinTimeout: 3 * time.Second,
Target: []string{instanceStatusStopped},
Refresh: statusDBInstance(conn, id),
Timeout: timeout,
MinTimeout: 3 * time.Second,
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand All @@ -2971,9 +2967,7 @@ func waitDBInstanceStopped(ctx context.Context, conn *rds.Client, id string, tim

func waitDBInstanceDeleted(ctx context.Context, conn *rds.Client, id string, timeout time.Duration, optFns ...tfresource.OptionsFunc) (*types.DBInstance, error) {
options := tfresource.Options{
PollInterval: 10 * time.Second,
Delay: 1 * time.Minute,
ContinuousTargetOccurence: 3,
PollInterval: 10 * time.Second,
}
for _, fn := range optFns {
fn(&options)
Expand Down
Loading