feat(aws): EMR Clusters to use PreResourceResolver (#2411)

disq · web-flow · commit b01e6caa0bb4 · 2022-10-05T09:33:23.000Z
Should fix #2392
diff --git a/plugins/source/aws/codegen/recipes/emr.go b/plugins/source/aws/codegen/recipes/emr.go
@@ -29,9 +29,10 @@ func EMRResources() []*Resource {
 			},
 		},
 		{
-			SubService: "clusters",
-			Struct:     &types.Cluster{},
-			SkipFields: []string{"ClusterArn", "Tags"},
+			SubService:          "clusters",
+			Struct:              &types.Cluster{},
+			SkipFields:          []string{"ClusterArn", "Tags"},
+			PreResourceResolver: "getCluster",
 			ExtraColumns: append(
 				defaultRegionalColumns,
 				[]codegen.ColumnDefinition{
diff --git a/plugins/source/aws/resources/services/emr/clusters.go b/plugins/source/aws/resources/services/emr/clusters.go
diff --git a/plugins/source/aws/resources/services/emr/clusters_fetch.go b/plugins/source/aws/resources/services/emr/clusters_fetch.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/emr"
+	"github.com/aws/aws-sdk-go-v2/service/emr/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
 	"github.com/cloudquery/plugin-sdk/schema"
 )
@@ -18,17 +19,23 @@ func fetchEmrClusters(ctx context.Context, meta schema.ClientMeta, parent *schem
 		if err != nil {
 			return err
 		}
-		for _, c := range response.Clusters {
-			out, err := svc.DescribeCluster(ctx, &emr.DescribeClusterInput{ClusterId: c.Id})
-			if err != nil {
-				return err
-			}
-			res <- out.Cluster
-		}
+		res <- response.Clusters
+
 		if aws.ToString(response.Marker) == "" {
 			break
 		}
 		config.Marker = response.Marker
 	}
 	return nil
 }
+
+func getCluster(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error {
+	c := meta.(*client.Client)
+	svc := c.Services().EMR
+	response, err := svc.DescribeCluster(ctx, &emr.DescribeClusterInput{ClusterId: resource.Item.(types.ClusterSummary).Id})
+	if err != nil {
+		return err
+	}
+	resource.Item = response.Cluster
+	return nil
+}
