r/aws_neptune_cluster: Fixing Issue #38979 with incorrect default value used for cluster and instance parameter group

.changelog/38980.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_neptune_cluster: Mark `neptune_cluster_parameter_group_name` as Computed
+```
+
+```release-note:bug
+resource/aws_neptune_cluster_instance: Mark `neptune_parameter_group_name` as Computed
+```

internal/service/neptune/cluster.go

@@ -27,6 +27,7 @@ import (
  tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
  tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
  "github.com/hashicorp/terraform-provider-aws/internal/tfresource"
+ itypes "github.com/hashicorp/terraform-provider-aws/internal/types"
  "github.com/hashicorp/terraform-provider-aws/internal/verify"
  "github.com/hashicorp/terraform-provider-aws/names"
 )
@@ -201,7 +202,7 @@ func resourceCluster() *schema.Resource {
  "neptune_cluster_parameter_group_name": {
  Type: schema.TypeString,
  Optional: true,
- Default: "default.neptune1",
+ Computed: true,
  },
  "neptune_instance_parameter_group_name": {
  Type: schema.TypeString,
@@ -480,7 +481,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int
 
  d.SetId(clusterID)
 
- if _, err = waitDBClusterAvailable(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
+ if _, err = waitDBClusterAvailable(ctx, conn, d.Id(), false, d.Timeout(schema.TimeoutCreate)); err != nil {
  return sdkdiag.AppendErrorf(diags, "waiting for Neptune Cluster (%s) create: %s", d.Id(), err)
  }
 
@@ -501,7 +502,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int
  return sdkdiag.AppendErrorf(diags, "modifying Neptune Cluster (%s): %s", d.Id(), err)
  }
 
- if _, err = waitDBClusterAvailable(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
+ if _, err = waitDBClusterAvailable(ctx, conn, d.Id(), true, d.Timeout(schema.TimeoutCreate)); err != nil {
  return sdkdiag.AppendErrorf(diags, "waiting for Neptune Cluster (%s) update: %s", d.Id(), err)
  }
  }
@@ -691,7 +692,7 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta int
  return sdkdiag.AppendErrorf(diags, "modifying Neptune Cluster (%s): %s", d.Id(), err)
  }
 
- if _, err = waitDBClusterAvailable(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
+ if _, err = waitDBClusterAvailable(ctx, conn, d.Id(), true, d.Timeout(schema.TimeoutUpdate)); err != nil {
  return sdkdiag.AppendErrorf(diags, "waiting for Neptune Cluster (%s) update: %s", d.Id(), err)
  }
  }
@@ -903,7 +904,7 @@ func findDBClusters(ctx context.Context, conn *neptune.Client, input *neptune.De
  return output, nil
 }
 
-func statusDBCluster(ctx context.Context, conn *neptune.Client, id string) retry.StateRefreshFunc {
+func statusDBCluster(ctx context.Context, conn *neptune.Client, id string, waitNoPendingModifiedValues bool) retry.StateRefreshFunc {
  return func() (interface{}, string, error) {
  output, err := findDBClusterByID(ctx, conn, id)
 
@@ -915,23 +916,34 @@ func statusDBCluster(ctx context.Context, conn *neptune.Client, id string) retry
  return nil, "", err
  }
 
- return output, aws.ToString(output.Status), nil
+ status := aws.ToString(output.Status)
+
+ if status == clusterStatusAvailable && waitNoPendingModifiedValues && !itypes.IsZero(output.PendingModifiedValues) {
+ status = clusterStatusAvailableWithPendingModifiedValues
+ }
+
+ return output, status, nil
  }
 }
 
-func waitDBClusterAvailable(ctx context.Context, conn *neptune.Client, id string, timeout time.Duration) (*awstypes.DBCluster, error) { //nolint:unparam
+func waitDBClusterAvailable(ctx context.Context, conn *neptune.Client, id string, waitNoPendingModifiedValues bool, timeout time.Duration) (*awstypes.DBCluster, error) { //nolint:unparam
+ pendingStatuses := []string{
+ clusterStatusCreating,
+ clusterStatusBackingUp,
+ clusterStatusModifying,
+ clusterStatusPreparingDataMigration,
+ clusterStatusMigrating,
+ clusterStatusConfiguringIAMDatabaseAuth,
+ clusterStatusUpgrading,
+ }
+ if waitNoPendingModifiedValues {
+ pendingStatuses = append(pendingStatuses, clusterStatusAvailableWithPendingModifiedValues)
+ }
+
  stateConf := &retry.StateChangeConf{
- Pending: []string{
- clusterStatusCreating,
- clusterStatusBackingUp,
- clusterStatusModifying,
- clusterStatusPreparingDataMigration,
- clusterStatusMigrating,
- clusterStatusConfiguringIAMDatabaseAuth,
- clusterStatusUpgrading,
- },
+ Pending: pendingStatuses,
  Target: []string{clusterStatusAvailable},
- Refresh: statusDBCluster(ctx, conn, id),
+ Refresh: statusDBCluster(ctx, conn, id, waitNoPendingModifiedValues),
  Timeout: timeout,
  MinTimeout: 10 * time.Second,
  Delay: 30 * time.Second,
@@ -955,7 +967,7 @@ func waitDBClusterDeleted(ctx context.Context, conn *neptune.Client, id string,
  clusterStatusModifying,
  },
  Target: []string{},
- Refresh: statusDBCluster(ctx, conn, id),
+ Refresh: statusDBCluster(ctx, conn, id, false),
  Timeout: timeout,
  MinTimeout: 10 * time.Second,
  Delay: 30 * time.Second,

internal/service/neptune/cluster_instance.go

@@ -124,7 +124,7 @@ func resourceClusterInstance() *schema.Resource {
  "neptune_parameter_group_name": {
  Type: schema.TypeString,
  Optional: true,
- Default: "default.neptune1",
+ Computed: true,
  },
  "neptune_subnet_group_name": {
  Type: schema.TypeString,

internal/service/neptune/cluster_instance_test.go

@@ -298,10 +298,6 @@ func testAccCheckClusterInstanceExists(ctx context.Context, n string, v *awstype
  return fmt.Errorf("Not found: %s", n)
  }
 
- if rs.Primary.ID == "" {
- return fmt.Errorf("No Neptune Cluster Instance ID is set")
- }
-
  conn := acctest.Provider.Meta().(*conns.AWSClient).NeptuneClient(ctx)
 
  output, err := tfneptune.FindDBInstanceByID(ctx, conn, rs.Primary.ID)
@@ -349,12 +345,12 @@ data "aws_neptune_orderable_db_instance" "test" {
  engine_version = aws_neptune_cluster.test.engine_version
  license_model = "amazon-license"
 
- preferred_instance_classes = ["db.t3.medium", "db.r5.large", "db.r4.large"]
+ preferred_instance_classes = ["db.t4g.medium", "db.r6g.large", "db.r5.large", "db.t3.medium", "db.r4.large"]
 }
 
 resource "aws_neptune_parameter_group" "test" {
  name = %[1]q
- family = "neptune1.3"
+ family = join("", ["neptune", split(".", aws_neptune_cluster.test.engine_version)[0], ".", split(".", aws_neptune_cluster.test.engine_version)[1]])
 
  parameter {
  name = "neptune_query_timeout"
@@ -367,11 +363,10 @@ resource "aws_neptune_parameter_group" "test" {
 func testAccClusterInstanceConfig_base(rName string) string {
  return acctest.ConfigCompose(testAccClusterInstanceConfig_baseSansCluster(rName), acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
 resource "aws_neptune_cluster" "test" {
- cluster_identifier = %[1]q
- availability_zones = slice(data.aws_availability_zones.available.names, 0, min(3, length(data.aws_availability_zones.available.names)))
- engine = "neptune"
- neptune_cluster_parameter_group_name = "default.neptune1.3"
- skip_final_snapshot = true
+ cluster_identifier = %[1]q
+ availability_zones = slice(data.aws_availability_zones.available.names, 0, min(3, length(data.aws_availability_zones.available.names)))
+ engine = "neptune"
+ skip_final_snapshot = true
 }
 `, rName))
 }
@@ -494,10 +489,9 @@ resource "aws_neptune_subnet_group" "test" {
 }
 
 resource "aws_neptune_cluster" "test" {
- cluster_identifier = %[1]q
- neptune_subnet_group_name = aws_neptune_subnet_group.test.name
- neptune_cluster_parameter_group_name = "default.neptune1.3"
- skip_final_snapshot = true
+ cluster_identifier = %[1]q
+ neptune_subnet_group_name = aws_neptune_subnet_group.test.name
+ skip_final_snapshot = true
 }
 `, rName))
 }
@@ -540,8 +534,6 @@ resource "aws_neptune_cluster" "test" {
  skip_final_snapshot = true
  storage_encrypted = true
  kms_key_arn = aws_kms_key.test.arn
-
- neptune_cluster_parameter_group_name = "default.neptune1.3"
 }
 `, rName))
 }