From 7cd8d9fc93e1951767d35a1b1218cf12030f786e Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 31 Oct 2023 17:57:31 -0400 Subject: [PATCH 1/4] rds/cluster: Use AWS backup retention default --- internal/service/rds/cluster.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index 135601af2498..51c5db656a41 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -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": { @@ -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), From 2cace244b34e7f94ead0d3546301c9396769e574 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 31 Oct 2023 18:01:41 -0400 Subject: [PATCH 2/4] Add changelog --- .changelog/34187.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/34187.txt diff --git a/.changelog/34187.txt b/.changelog/34187.txt new file mode 100644 index 000000000000..7bd0e9508778 --- /dev/null +++ b/.changelog/34187.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_rds_cluster: Remove the provider default (previously "1") and use the AWS default for `backup_retention_period` (also "1") +``` \ No newline at end of file From 966b2797cddb590c233eb5793ab128123800343f Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 31 Oct 2023 18:51:38 -0400 Subject: [PATCH 3/4] Update changelog --- .changelog/34187.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.changelog/34187.txt b/.changelog/34187.txt index 7bd0e9508778..b5a87d583de2 100644 --- a/.changelog/34187.txt +++ b/.changelog/34187.txt @@ -1,3 +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") +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 +``` + +```release-note:bug +resource/aws_rds_cluster: Avoid an error on delete related to `unexpected state 'scaling-compute'` ``` \ No newline at end of file From bf7d4aa6bbb640386b087b8647724ca56982d1f9 Mon Sep 17 00:00:00 2001 From: Dirk Avery <31492422+YakDriver@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:40:04 -0400 Subject: [PATCH 4/4] Update .changelog/34187.txt Co-authored-by: Kit Ewbank --- .changelog/34187.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/34187.txt b/.changelog/34187.txt index b5a87d583de2..b3c62485409a 100644 --- a/.changelog/34187.txt +++ b/.changelog/34187.txt @@ -1,5 +1,5 @@ ```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 +resource/aws_rds_cluster: Remove the provider default (previously, "1") and use the AWS default for `backup_retention_period` (also, "1") to allow integration with AWS Backup ``` ```release-note:bug