Merge pull request #34637 from hashicorp/td-docdb-sweepers

[WIP] DocDB & Neptune sweepers

.changelog/34500.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_neptune_parameter_group: Add `name_prefix` argument
+```

.changelog/34637.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_docdb_cluster: Add `storage_type` argument
+```

internal/service/docdb/cluster_parameter_group.go

@@ -26,8 +26,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-const clusterParameterGroupMaxParamsBulkEdit = 20
-
 // @SDKResource("aws_docdb_cluster_parameter_group", name="Cluster Parameter Group")
 // @Tags(identifierAttribute="arn")
 func ResourceClusterParameterGroup() *schema.Resource {
@@ -159,21 +157,8 @@ func resourceClusterParameterGroupRead(ctx context.Context, d *schema.ResourceDa
 	input := &docdb.DescribeDBClusterParametersInput{
 		DBClusterParameterGroupName: aws.String(d.Id()),
 	}
-	var parameters []*docdb.Parameter
-
-	err = conn.DescribeDBClusterParametersPagesWithContext(ctx, input, func(page *docdb.DescribeDBClusterParametersOutput, lastPage bool) bool {
-		if page == nil {
-			return !lastPage
-		}
 
-		for _, v := range page.Parameters {
-			if v != nil {
-				parameters = append(parameters, v)
-			}
-		}
-
-		return !lastPage
-	})
+	parameters, err := findDBClusterParameters(ctx, conn, input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "reading DocumentDB Cluster Parameter Group (%s) parameters: %s", d.Id(), err)
@@ -192,15 +177,7 @@ func resourceClusterParameterGroupUpdate(ctx context.Context, d *schema.Resource
 
 	if d.HasChange("parameter") {
 		o, n := d.GetChange("parameter")
-		if o == nil {
-			o = new(schema.Set)
-		}
-		if n == nil {
-			n = new(schema.Set)
-		}
-
-		os := o.(*schema.Set)
-		ns := n.(*schema.Set)
+		os, ns := o.(*schema.Set), n.(*schema.Set)
 
 		if parameters := expandParameters(ns.Difference(os).List()); len(parameters) > 0 {
 			err := modifyClusterParameterGroupParameters(ctx, conn, d.Id(), parameters)
@@ -243,6 +220,9 @@ func resourceClusterParameterGroupDelete(ctx context.Context, d *schema.Resource
 }
 
 func modifyClusterParameterGroupParameters(ctx context.Context, conn *docdb.DocDB, name string, parameters []*docdb.Parameter) error {
+	const (
+		clusterParameterGroupMaxParamsBulkEdit = 20
+	)
 	// We can only modify 20 parameters at a time, so chunk them until we've got them all.
 	for _, chunk := range tfslices.Chunks(parameters, clusterParameterGroupMaxParamsBulkEdit) {
 		input := &docdb.ModifyDBClusterParameterGroupInput{
@@ -320,3 +300,34 @@ func findDBClusterParameterGroups(ctx context.Context, conn *docdb.DocDB, input
 
 	return output, nil
 }
+
+func findDBClusterParameters(ctx context.Context, conn *docdb.DocDB, input *docdb.DescribeDBClusterParametersInput) ([]*docdb.Parameter, error) {
+	var output []*docdb.Parameter
+
+	err := conn.DescribeDBClusterParametersPagesWithContext(ctx, input, func(page *docdb.DescribeDBClusterParametersOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.Parameters {
+			if v != nil {
+				output = append(output, v)
+			}
+		}
+
+		return !lastPage
+	})
+
+	if tfawserr.ErrCodeEquals(err, docdb.ErrCodeDBParameterGroupNotFoundFault) {
+		return nil, &retry.NotFoundError{
+			LastError:   err,
+			LastRequest: input,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return output, nil
+}