Merge pull request #17872 from hashicorp/b-neptune-parameter-group-update

r/neptune_cluster_parameter_group: update parameter field modification on create/update

Author: anGie44

.changelog/17872.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_neptune_cluster_parameter_group: Correctly update resource by `id`
+```

aws/resource_aws_neptune_cluster_parameter_group.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/neptune"
+	"github.com/hashicorp/aws-sdk-go-base/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -107,18 +108,21 @@ func resourceAwsNeptuneClusterParameterGroupCreate(d *schema.ResourceData, meta
 		Tags:                        tags,
 	}
 
-	log.Printf("[DEBUG] Create Neptune Cluster Parameter Group: %#v", createOpts)
-	resp, err := conn.CreateDBClusterParameterGroup(&createOpts)
+	_, err := conn.CreateDBClusterParameterGroup(&createOpts)
 	if err != nil {
-		return fmt.Errorf("Error creating Neptune Cluster Parameter Group: %s", err)
+		return fmt.Errorf("error creating Neptune Cluster Parameter Group (%s): %w", groupName, err)
 	}
 
 	d.SetId(aws.StringValue(createOpts.DBClusterParameterGroupName))
-	log.Printf("[INFO] Neptune Cluster Parameter Group ID: %s", d.Id())
 
-	d.Set("arn", resp.DBClusterParameterGroup.DBClusterParameterGroupArn)
+	if v, ok := d.GetOk("parameter"); ok && v.(*schema.Set).Len() > 0 {
+		err := modifyNeptuneClusterParameterGroupParameters(conn, d.Id(), expandNeptuneParameters(v.(*schema.Set).List()))
+		if err != nil {
+			return fmt.Errorf("error modifying Neptune Cluster Parameter Group (%s): %w", d.Id(), err)
+		}
+	}
 
-	return resourceAwsNeptuneClusterParameterGroupUpdate(d, meta)
+	return resourceAwsNeptuneClusterParameterGroupRead(d, meta)
 }
 
 func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta interface{}) error {
@@ -130,17 +134,21 @@ func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta in
 	}
 
 	describeResp, err := conn.DescribeDBClusterParameterGroups(&describeOpts)
-	if err != nil {
-		if isAWSErr(err, neptune.ErrCodeDBParameterGroupNotFoundFault, "") {
-			log.Printf("[WARN] Neptune Cluster Parameter Group (%s) not found, removing from state", d.Id())
-			d.SetId("")
-			return nil
-		}
+	if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, neptune.ErrCodeDBParameterGroupNotFoundFault) {
+		log.Printf("[WARN] Neptune Cluster Parameter Group (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
 
-		return err
+	if err != nil {
+		return fmt.Errorf("error reading Neptune Cluster Parameter Group (%s): %w", d.Id(), err)
 	}
 
-	if len(describeResp.DBClusterParameterGroups) == 0 {
+	if describeResp == nil || len(describeResp.DBClusterParameterGroups) == 0 {
+		if d.IsNewResource() {
+			return fmt.Errorf("error reading Neptune Cluster Parameter Group (%s): not found", d.Id())
+		}
+
 		log.Printf("[WARN] Neptune Cluster Parameter Group (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil
@@ -164,17 +172,17 @@ func resourceAwsNeptuneClusterParameterGroupRead(d *schema.ResourceData, meta in
 	}
 
 	if err := d.Set("parameter", flattenNeptuneParameters(describeParametersResp.Parameters)); err != nil {
-		return fmt.Errorf("error setting neptune parameter: %s", err)
+		return fmt.Errorf("error setting neptune parameter: %w", err)
 	}
 
 	tags, err := keyvaluetags.NeptuneListTags(conn, d.Get("arn").(string))
 
 	if err != nil {
-		return fmt.Errorf("error listing tags for Neptune Cluster Parameter Group (%s): %s", d.Get("arn").(string), err)
+		return fmt.Errorf("error listing tags for Neptune Cluster Parameter Group (%s): %w", d.Id(), err)
 	}
 
 	if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
-		return fmt.Errorf("error setting tags: %s", err)
+		return fmt.Errorf("error setting tags: %w", err)
 	}
 
 	return nil
@@ -198,26 +206,9 @@ func resourceAwsNeptuneClusterParameterGroupUpdate(d *schema.ResourceData, meta
 		parameters := expandNeptuneParameters(ns.Difference(os).List())
 
 		if len(parameters) > 0 {
-			// We can only modify 20 parameters at a time, so walk them until
-			// we've got them all.
-			for parameters != nil {
-				var paramsToModify []*neptune.Parameter
-				if len(parameters) <= neptuneClusterParameterGroupMaxParamsBulkEdit {
-					paramsToModify, parameters = parameters[:], nil
-				} else {
-					paramsToModify, parameters = parameters[:neptuneClusterParameterGroupMaxParamsBulkEdit], parameters[neptuneClusterParameterGroupMaxParamsBulkEdit:]
-				}
-				parameterGroupName := d.Get("name").(string)
-				modifyOpts := neptune.ModifyDBClusterParameterGroupInput{
-					DBClusterParameterGroupName: aws.String(parameterGroupName),
-					Parameters:                  paramsToModify,
-				}
-
-				log.Printf("[DEBUG] Modify Neptune Cluster Parameter Group: %s", modifyOpts)
-				_, err := conn.ModifyDBClusterParameterGroup(&modifyOpts)
-				if err != nil {
-					return fmt.Errorf("Error modifying Neptune Cluster Parameter Group: %s", err)
-				}
+			err := modifyNeptuneClusterParameterGroupParameters(conn, d.Id(), parameters)
+			if err != nil {
+				return fmt.Errorf("error updating Neptune Cluster Parameter Group (%s) parameter: %w", d.Id(), err)
 			}
 		}
 	}
@@ -226,7 +217,7 @@ func resourceAwsNeptuneClusterParameterGroupUpdate(d *schema.ResourceData, meta
 		o, n := d.GetChange("tags")
 
 		if err := keyvaluetags.NeptuneUpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
-			return fmt.Errorf("error updating Neptune Cluster Parameter Group (%s) tags: %s", d.Get("arn").(string), err)
+			return fmt.Errorf("error updating Neptune Cluster Parameter Group (%s) tags: %w", d.Id(), err)
 		}
 	}
 
@@ -240,13 +231,37 @@ func resourceAwsNeptuneClusterParameterGroupDelete(d *schema.ResourceData, meta
 		DBClusterParameterGroupName: aws.String(d.Id()),
 	}
 
-	log.Printf("[DEBUG] Deleting Neptune Cluster Parameter Group: %s", d.Id())
 	_, err := conn.DeleteDBClusterParameterGroup(&input)
 	if err != nil {
-		if isAWSErr(err, neptune.ErrCodeDBParameterGroupNotFoundFault, "") {
+		if tfawserr.ErrCodeEquals(err, neptune.ErrCodeDBParameterGroupNotFoundFault) {
 			return nil
 		}
-		return fmt.Errorf("error deleting Neptune Cluster Parameter Group (%s): %s", d.Id(), err)
+		return fmt.Errorf("error deleting Neptune Cluster Parameter Group (%s): %w", d.Id(), err)
+	}
+
+	return nil
+}
+
+func modifyNeptuneClusterParameterGroupParameters(conn *neptune.Neptune, name string, parameters []*neptune.Parameter) error {
+	// We can only modify 20 parameters at a time, so walk them until
+	// we've got them all.
+	for parameters != nil {
+		var paramsToModify []*neptune.Parameter
+		if len(parameters) <= neptuneClusterParameterGroupMaxParamsBulkEdit {
+			paramsToModify, parameters = parameters[:], nil
+		} else {
+			paramsToModify, parameters = parameters[:neptuneClusterParameterGroupMaxParamsBulkEdit], parameters[neptuneClusterParameterGroupMaxParamsBulkEdit:]
+		}
+
+		modifyOpts := neptune.ModifyDBClusterParameterGroupInput{
+			DBClusterParameterGroupName: aws.String(name),
+			Parameters:                  paramsToModify,
+		}
+
+		_, err := conn.ModifyDBClusterParameterGroup(&modifyOpts)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

aws/resource_aws_neptune_cluster_parameter_group_test.go

@@ -128,6 +128,52 @@ func TestAccAWSNeptuneClusterParameterGroup_Description(t *testing.T) {
 	})
 }
 
+// Reference: https://github.com/hashicorp/terraform-provider-aws/issues/17870
+func TestAccAWSNeptuneClusterParameterGroup_NamePrefix_Parameter(t *testing.T) {
+	var v neptune.DBClusterParameterGroup
+
+	resourceName := "aws_neptune_cluster_parameter_group.test"
+	prefix := "tf-acc-test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSNeptuneClusterParameterGroupDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSNeptuneClusterParameterGroupConfig_NamePrefix_Parameter(prefix, "neptune_enable_audit_log", "1"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSNeptuneClusterParameterGroupExists(resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, "parameter.#", "1"),
+					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "parameter.*", map[string]string{
+						"apply_method": "pending-reboot",
+						"name":         "neptune_enable_audit_log",
+						"value":        "1",
+					}),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"name_prefix"},
+			},
+			{
+				Config: testAccAWSNeptuneClusterParameterGroupConfig_NamePrefix_Parameter(prefix, "neptune_enable_audit_log", "0"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSNeptuneClusterParameterGroupExists(resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, "parameter.#", "1"),
+					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "parameter.*", map[string]string{
+						"apply_method": "pending-reboot",
+						"name":         "neptune_enable_audit_log",
+						"value":        "0",
+					}),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAWSNeptuneClusterParameterGroup_Parameter(t *testing.T) {
 	var v neptune.DBClusterParameterGroup
 
@@ -326,6 +372,20 @@ resource "aws_neptune_cluster_parameter_group" "test" {
 `, name, pName, pValue)
 }
 
+func testAccAWSNeptuneClusterParameterGroupConfig_NamePrefix_Parameter(namePrefix, pName, pValue string) string {
+	return fmt.Sprintf(`
+resource "aws_neptune_cluster_parameter_group" "test" {
+  family      = "neptune1"
+  name_prefix = %q
+
+  parameter {
+    name  = %q
+    value = %q
+  }
+}
+`, namePrefix, pName, pValue)
+}
+
 func testAccAWSNeptuneClusterParameterGroupConfig_Tags(name, tKey, tValue string) string {
 	return fmt.Sprintf(`
 resource "aws_neptune_cluster_parameter_group" "test" {