use paginator

Signed-off-by: Kyle McCullough <[email protected]>

Author: kylemcc

resources/services/ecs/task_definitions_fetch.go

@@ -10,7 +10,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 
 	"github.com/OpsHelmInc/cloudquery/client"
-	"github.com/OpsHelmInc/cloudquery/resources/services/ecs/models"
+	"github.com/OpsHelmInc/ohaws"
 )
 
 func fetchEcsTaskDefinitions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
@@ -47,14 +47,14 @@ func getTaskDefinition(ctx context.Context, meta schema.ClientMeta, resource *sc
 	if describeTaskDefinitionOutput.TaskDefinition == nil {
 		return errors.New("nil TaskDefinition encountered")
 	}
-	resource.Item = models.TaskDefinitionWrapper{
+	resource.Item = ohaws.TaskDefinition{
 		TaskDefinition: describeTaskDefinitionOutput.TaskDefinition,
 		Tags:           describeTaskDefinitionOutput.Tags,
 	}
 	return nil
 }
 
 func resolveEcsTaskDefinitionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error {
-	r := resource.Item.(models.TaskDefinitionWrapper)
+	r := resource.Item.(ohaws.TaskDefinition)
 	return resource.Set(c.Name, client.TagsToMap(r.Tags))
 }

resources/services/efs/filesystems_fetch.go

@@ -3,27 +3,26 @@ package efs
 import (
 	"context"
 
-	"github.com/OpsHelmInc/cloudquery/client"
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/efs"
 	"github.com/aws/aws-sdk-go-v2/service/efs/types"
 	"github.com/cloudquery/plugin-sdk/schema"
+
+	"github.com/OpsHelmInc/cloudquery/client"
 )
 
 func fetchEfsFilesystems(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	var config efs.DescribeFileSystemsInput
 	c := meta.(*client.Client)
 	svc := c.Services().Efs
-	for {
-		response, err := svc.DescribeFileSystems(ctx, &config)
+	paginator := efs.NewDescribeFileSystemsPaginator(svc, &config)
+	for paginator.HasMorePages() {
+		page, err := paginator.NextPage(ctx, func(options *efs.Options) {
+			options.Region = c.Region
+		})
 		if err != nil {
 			return err
 		}
-		res <- response.FileSystems
-		if aws.ToString(response.Marker) == "" {
-			break
-		}
-		config.Marker = response.NextMarker
+		res <- page.FileSystems
 	}
 	return nil
 }