Skip to content
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

Jump to bottom

rds/cluster: Use AWS backup retention default #34187

Merged
merged 4 commits into from
Nov 1, 2023
Merged

rds/cluster: Use AWS backup retention default #34187

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cd8d9f
rds/cluster: Use AWS backup retention default
YakDriver Oct 31, 2023
2cace24
Add changelog
YakDriver Oct 31, 2023
966b279
Update changelog
YakDriver Oct 31, 2023
bf7d4aa
Update .changelog/34187.txt
YakDriver Nov 1, 2023
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
7 changes: 7 additions & 0 deletions .changelog/34187.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_rds_cluster: Remove the provider default (previously, "1") and use the AWS default for `backup_retention_period` (also, "1") to allow intergration with AWS Backup
YakDriver marked this conversation as resolved.
Show resolved Hide resolved
```

```release-note:bug
resource/aws_rds_cluster: Avoid an error on delete related to `unexpected state 'scaling-compute'`
```
3 changes: 2 additions & 1 deletion internal/service/rds/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func ResourceCluster() *schema.Resource {
"backup_retention_period": {
Type: schema.TypeInt,
Optional: true,
Default: 1,
Computed: true,
ValidateFunc: validation.IntAtMost(35),
},
"backtrack_window": {
Expand Down Expand Up @@ -1740,6 +1740,7 @@ func waitDBClusterDeleted(ctx context.Context, conn *rds.RDS, id string, timeout
ClusterStatusDeleting,
ClusterStatusModifying,
ClusterStatusPromoting,
ClusterStatusScalingCompute,
},
Target: []string{},
Refresh: statusDBCluster(ctx, conn, id),
Expand Down
Loading