From e8329da2cc618c3d1d300b0c9bfe7fbb4c52154a Mon Sep 17 00:00:00 2001 From: Corentin Le Devedec <35999896+ldcorentin@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:33:33 +0100 Subject: [PATCH 1/6] Update Neptune ServerlessMinNCUs from 2.5 to 1.0 It is possible now for Neptune to decrease the minimum NCU value to 1.0 instead of 2.5 before. https://docs.aws.amazon.com/neptune/latest/userguide/neptune-serverless-capacity-scaling.html --- internal/service/neptune/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/neptune/cluster.go b/internal/service/neptune/cluster.go index 0245e4788b11..4e26be1e9a63 100644 --- a/internal/service/neptune/cluster.go +++ b/internal/service/neptune/cluster.go @@ -31,7 +31,7 @@ const ( DefaultPort = 8182 - ServerlessMinNCUs = 2.5 + ServerlessMinNCUs = 1 ServerlessMaxNCUs = 128.0 ) From 2d98db7f1eb15a3a80e84ca4c61064e78c50a508 Mon Sep 17 00:00:00 2001 From: Corentin Le Devedec <35999896+ldcorentin@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:07:09 +0100 Subject: [PATCH 2/6] int to float --- internal/service/neptune/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/neptune/cluster.go b/internal/service/neptune/cluster.go index 4e26be1e9a63..7cfbb7351bfa 100644 --- a/internal/service/neptune/cluster.go +++ b/internal/service/neptune/cluster.go @@ -31,7 +31,7 @@ const ( DefaultPort = 8182 - ServerlessMinNCUs = 1 + ServerlessMinNCUs = 1.0 ServerlessMaxNCUs = 128.0 ) From 55d64bfd68ba717d68a7985e61e4d21d76c4d00c Mon Sep 17 00:00:00 2001 From: Corentin Le Devedec <35999896+ldcorentin@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:08:00 +0100 Subject: [PATCH 3/6] Add changelog --- .changelog/29999.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/29999.txt diff --git a/.changelog/29999.txt b/.changelog/29999.txt new file mode 100644 index 000000000000..78bac490c01d --- /dev/null +++ b/.changelog/29999.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_neptune_cluster: decrease ServerlessMinNCUs default value from 2.5 to 1.0 +``` From 27a1601be745d6dddeb8c3aaa930bae492f0fa19 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 14 Mar 2023 17:06:23 -0400 Subject: [PATCH 4/6] Tweak CHANGELOG entry. --- .changelog/29999.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/29999.txt b/.changelog/29999.txt index 78bac490c01d..ff1ec5c4f962 100644 --- a/.changelog/29999.txt +++ b/.changelog/29999.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_neptune_cluster: decrease ServerlessMinNCUs default value from 2.5 to 1.0 +resource/aws_neptune_cluster: Change lower bound validation for `serverless_v2_scaling_configuration.min_capacity` to 1 Neptune Capacity Unit (NCU) ``` From aed9127115b2e082bd0a5f3a7b3e884b568e0f58 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 14 Mar 2023 17:07:38 -0400 Subject: [PATCH 5/6] r/aws_neptune_cluster: Retain default value of 'serverless_v2_scaling_configuration.min_capacity' for backward compatability. --- internal/service/neptune/cluster.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/service/neptune/cluster.go b/internal/service/neptune/cluster.go index 7cfbb7351bfa..22193e391ddd 100644 --- a/internal/service/neptune/cluster.go +++ b/internal/service/neptune/cluster.go @@ -31,8 +31,9 @@ const ( DefaultPort = 8182 - ServerlessMinNCUs = 1.0 - ServerlessMaxNCUs = 128.0 + oldServerlessMinNCUs = 2.5 + ServerlessMinNCUs = 1.0 + ServerlessMaxNCUs = 128.0 ) // @SDKResource("aws_neptune_cluster") @@ -253,8 +254,8 @@ func ResourceCluster() *schema.Resource { "min_capacity": { Type: schema.TypeFloat, Optional: true, - Default: ServerlessMinNCUs, - // Minimum capacity is 2.5 NCUs + Default: oldServerlessMinNCUs, + // Minimum capacity is 1.0 NCU // see: https://docs.aws.amazon.com/neptune/latest/userguide/neptune-serverless-capacity-scaling.html ValidateFunc: validation.FloatAtLeast(ServerlessMinNCUs), }, From 0eb65ca273f5b751834a9421ba2539923e0da9c9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 14 Mar 2023 17:08:55 -0400 Subject: [PATCH 6/6] r/aws_neptune_cluster: Document new minimum value of 'serverless_v2_scaling_configuration.min_capacity'. --- website/docs/r/neptune_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/neptune_cluster.html.markdown b/website/docs/r/neptune_cluster.html.markdown index 7e4e5f933665..933081620654 100644 --- a/website/docs/r/neptune_cluster.html.markdown +++ b/website/docs/r/neptune_cluster.html.markdown @@ -94,7 +94,7 @@ resource "aws_neptune_cluster_instance" "example" { } ``` -* `min_capacity`: (default: **2.5**) The minimum Neptune Capacity Units (NCUs) for this cluster. Must be greater or equal than **2.5**. See [AWS Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/neptune-serverless-capacity-scaling.html) for more details. +* `min_capacity`: (default: **2.5**) The minimum Neptune Capacity Units (NCUs) for this cluster. Must be greater or equal than **1**. See [AWS Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/neptune-serverless-capacity-scaling.html) for more details. * `max_capacity`: (default: **128**) The maximum Neptune Capacity Units (NCUs) for this cluster. Must be lower or equal than **128**. See [AWS Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/neptune-serverless-capacity-scaling.html) for more details. ## Attributes Reference