Remove duplicate memoizing of getCommonColumns (#2065)

turbot · Feb 2, 2024 · 39c8985 · 39c8985
1 parent e41a9d3
commit 39c8985
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/aws/table_aws_ec2_launch_template.go b/aws/table_aws_ec2_launch_template.go
@@ -169,8 +169,7 @@ func listEc2LaunchTemplates(ctx context.Context, d *plugin.QueryData, _ *plugin.
 func launchTemplateAkas(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 	launchTemplate := h.Item.(types.LaunchTemplate)
 	region := d.EqualsQualString(matrixKeyRegion)
-	getCommonColumnsCached := plugin.HydrateFunc(getCommonColumns).WithCache()
-	commonData, err := getCommonColumnsCached(ctx, d, h)
+	commonData, err := getCommonColumns(ctx, d, h)
 	if err != nil {
 		plugin.Logger(ctx).Error("aws_ec2_launch_template.launchTemplateAkas", "common_data_error", err)
 		return nil, err

diff --git a/aws/table_aws_s3_multi_region_access_point.go b/aws/table_aws_s3_multi_region_access_point.go
@@ -90,8 +90,7 @@ func tableAwsS3MultiRegionAccessPoint(_ context.Context) *plugin.Table {
 
 func listS3MultiRegionAccessPoints(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 	// Get account details
-	getCommonColumnsCached := plugin.HydrateFunc(getCommonColumns).WithCache()
-	commonData, err := getCommonColumnsCached(ctx, d, h)
+	commonData, err := getCommonColumns(ctx, d, h)
 	if err != nil {
 		plugin.Logger(ctx).Error("aws_s3_multi_region_access_point.listS3MultiRegionAccessPoints", "common_data_error", err)
 		return nil, err
@@ -162,8 +161,7 @@ func listS3MultiRegionAccessPoints(ctx context.Context, d *plugin.QueryData, h *
 func getS3MultiRegionAccessPoint(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 
 	// Get account details
-	getCommonColumnsCached := plugin.HydrateFunc(getCommonColumns).WithCache()
-	commonData, err := getCommonColumnsCached(ctx, d, h)
+	commonData, err := getCommonColumns(ctx, d, h)
 	if err != nil {
 		plugin.Logger(ctx).Error("aws_s3_multi_region_access_point.getS3MultiRegionAccessPoint", "common_data_error", err)
 		return nil, err
@@ -210,8 +208,7 @@ func getMultiRegionAccessPointArn(ctx context.Context, d *plugin.QueryData, h *p
 	accessPointName := multiRegionAccessPointName(h.Item)
 
 	// Get account details
-	getCommonColumnsCached := plugin.HydrateFunc(getCommonColumns).WithCache()
-	commonData, err := getCommonColumnsCached(ctx, d, h)
+	commonData, err := getCommonColumns(ctx, d, h)
 	if err != nil {
 		plugin.Logger(ctx).Error("aws_s3_multi_region_access_point.getMultiRegionAccessPointArn", "common_data_error", err)
 		return nil, err