From 6aa95c449b4f421f2e3a02c7b0dfc0d881a6094f Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 5 Oct 2025 02:16:18 +0900 Subject: [PATCH 1/3] SuppressMissingOptionalConfigurationBlock is invoked only for `serverlessv2_scaling_configuration` block --- internal/service/rds/cluster.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index 74d2effbef6b..e293af87796a 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -583,10 +583,15 @@ func resourceCluster() *schema.Resource { }, }, "serverlessv2_scaling_configuration": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - DiffSuppressFunc: verify.SuppressMissingOptionalConfigurationBlock, + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if k == "serverlessv2_scaling_configuration.#" { + return verify.SuppressMissingOptionalConfigurationBlock(k, old, new, d) + } + return false + }, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ names.AttrMaxCapacity: { From 215745a2feb70da6fe14e1b1c4fc4933f9bf9b0b Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 5 Oct 2025 02:18:10 +0900 Subject: [PATCH 2/3] Update the acctest to include a case where `min_capacity` is changed from `1` to `0` --- internal/service/rds/cluster_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index bb0c212d2fdf..5b04f2964869 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -2203,12 +2203,12 @@ func TestAccRDSCluster_serverlessV2ScalingConfiguration(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_serverlessV2ScalingConfiguration(rName, 64.0, 2.5), + Config: testAccClusterConfig_serverlessV2ScalingConfiguration(rName, 64.0, 1.0), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "serverlessv2_scaling_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "serverlessv2_scaling_configuration.0.max_capacity", "64"), - resource.TestCheckResourceAttr(resourceName, "serverlessv2_scaling_configuration.0.min_capacity", "2.5"), + resource.TestCheckResourceAttr(resourceName, "serverlessv2_scaling_configuration.0.min_capacity", "1"), resource.TestCheckResourceAttrSet(resourceName, "serverlessv2_scaling_configuration.0.seconds_until_auto_pause"), ), }, From 5bfbad7a34751fae023ac9e03f675b269b5b1f92 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 5 Oct 2025 02:34:08 +0900 Subject: [PATCH 3/3] add changelog --- .changelog/44545.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44545.txt diff --git a/.changelog/44545.txt b/.changelog/44545.txt new file mode 100644 index 000000000000..c6534da805ec --- /dev/null +++ b/.changelog/44545.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_rds_cluster: Fix inability to update `serverlessv2_scaling_configuration.min_capacity` argument from `1` to `0` +```