Added pagination support to DescribeFileSystems in EFS

.changelog/33336.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_efs_file_system: Fix `Search returned 0 results` errors when there are more than 101 file systems in the configured Region
+```

internal/service/efs/file_system.go

@@ -19,6 +19,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	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"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -343,12 +344,32 @@ func resourceFileSystemDelete(ctx context.Context, d *schema.ResourceData, meta
 	return nil
 }
 
-func FindFileSystemByID(ctx context.Context, conn *efs.EFS, id string) (*efs.FileSystemDescription, error) {
-	input := &efs.DescribeFileSystemsInput{
-		FileSystemId: aws.String(id),
+func findFileSystem(ctx context.Context, conn *efs.EFS, input *efs.DescribeFileSystemsInput, filter tfslices.Predicate[*efs.FileSystemDescription]) (*efs.FileSystemDescription, error) {
+	output, err := findFileSystems(ctx, conn, input, filter)
+
+	if err != nil {
+		return nil, err
 	}
 
-	output, err := conn.DescribeFileSystemsWithContext(ctx, input)
+	return tfresource.AssertSinglePtrResult(output)
+}
+
+func findFileSystems(ctx context.Context, conn *efs.EFS, input *efs.DescribeFileSystemsInput, filter tfslices.Predicate[*efs.FileSystemDescription]) ([]*efs.FileSystemDescription, error) {
+	var output []*efs.FileSystemDescription
+
+	err := conn.DescribeFileSystemsPagesWithContext(ctx, input, func(page *efs.DescribeFileSystemsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.FileSystems {
+			if v != nil && filter(v) {
+				output = append(output, v)
+			}
+		}
+
+		return !lastPage
+	})
 
 	if tfawserr.ErrCodeEquals(err, efs.ErrCodeFileSystemNotFound) {
 		return nil, &retry.NotFoundError{
@@ -361,11 +382,15 @@ func FindFileSystemByID(ctx context.Context, conn *efs.EFS, id string) (*efs.Fil
 		return nil, err
 	}
 
-	if output == nil || output.FileSystems == nil || len(output.FileSystems) == 0 || output.FileSystems[0] == nil {
-		return nil, tfresource.NewEmptyResultError(input)
+	return output, nil
+}
+
+func FindFileSystemByID(ctx context.Context, conn *efs.EFS, id string) (*efs.FileSystemDescription, error) {
+	input := &efs.DescribeFileSystemsInput{
+		FileSystemId: aws.String(id),
 	}
 
-	return output.FileSystems[0], nil
+	return findFileSystem(ctx, conn, input, tfslices.PredicateTrue[*efs.FileSystemDescription]())
 }
 
 func statusFileSystemLifeCycleState(ctx context.Context, conn *efs.EFS, id string) retry.StateRefreshFunc {

internal/service/efs/file_system_data_source.go

@@ -14,7 +14,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	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"
 )
 
 // @SDKDataSource("aws_efs_file_system")
@@ -104,50 +106,29 @@ func dataSourceFileSystemRead(ctx context.Context, d *schema.ResourceData, meta
 	conn := meta.(*conns.AWSClient).EFSConn(ctx)
 	ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
 
-	tagsToMatch := tftags.New(ctx, d.Get("tags").(map[string]interface{})).IgnoreAWS().IgnoreConfig(ignoreTagsConfig)
-
-	describeEfsOpts := &efs.DescribeFileSystemsInput{}
+	input := &efs.DescribeFileSystemsInput{}
 
 	if v, ok := d.GetOk("creation_token"); ok {
-		describeEfsOpts.CreationToken = aws.String(v.(string))
+		input.CreationToken = aws.String(v.(string))
 	}
 
 	if v, ok := d.GetOk("file_system_id"); ok {
-		describeEfsOpts.FileSystemId = aws.String(v.(string))
-	}
-
-	describeResp, err := conn.DescribeFileSystemsWithContext(ctx, describeEfsOpts)
-	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading EFS FileSystem: %s", err)
+		input.FileSystemId = aws.String(v.(string))
 	}
 
-	if describeResp == nil || len(describeResp.FileSystems) == 0 {
-		return sdkdiag.AppendErrorf(diags, "reading EFS FileSystem: empty output")
-	}
-
-	results := describeResp.FileSystems
-
-	if len(tagsToMatch) > 0 {
-		var fileSystems []*efs.FileSystemDescription
+	filter := tfslices.PredicateTrue[*efs.FileSystemDescription]()
 
-		for _, fileSystem := range describeResp.FileSystems {
-			tags := KeyValueTags(ctx, fileSystem.Tags)
-
-			if !tags.ContainsAll(tagsToMatch) {
-				continue
-			}
-
-			fileSystems = append(fileSystems, fileSystem)
+	if tagsToMatch := tftags.New(ctx, d.Get("tags").(map[string]interface{})).IgnoreAWS().IgnoreConfig(ignoreTagsConfig); len(tagsToMatch) > 0 {
+		filter = func(v *efs.FileSystemDescription) bool {
+			return KeyValueTags(ctx, v.Tags).ContainsAll(tagsToMatch)
 		}
-
-		results = fileSystems
 	}
 
-	if count := len(results); count != 1 {
-		return sdkdiag.AppendErrorf(diags, "Search returned %d results, please revise so only one is returned", count)
-	}
+	fs, err := findFileSystem(ctx, conn, input, filter)
 
-	fs := results[0]
+	if err != nil {
+		return sdkdiag.AppendFromErr(diags, tfresource.SingularDataSourceFindError("EFS file system", err))
+	}
 
 	d.SetId(aws.StringValue(fs.FileSystemId))
 	d.Set("arn", fs.FileSystemArn)

internal/service/efs/file_system_data_source_test.go

@@ -146,7 +146,7 @@ func TestAccEFSFileSystemDataSource_nonExistent_tags(t *testing.T) {
 			},
 			{
 				Config:      testAccFileSystemDataSourceConfig_tagsNonExistent(rName),
-				ExpectError: regexache.MustCompile(`Search returned 0 results`),
+				ExpectError: regexache.MustCompile(`no matching EFS file system found`),
 			},
 		},
 	})