Skip to content

feat(aws): Add more Elastic Search resources #5867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 5 commits into from
Dec 21, 2022
Merged

feat(aws): Add more Elastic Search resources #5867

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad9a31a
more aws elasticsearch resources
candiduslynx Dec 20, 2022
4c6f46f
fix fetchers
candiduslynx Dec 20, 2022
4747c26
don't do recursion
candiduslynx Dec 21, 2022
471b988
fix fetch
candiduslynx Dec 21, 2022
4355628
less diff
candiduslynx Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
don't do recursion
  • Loading branch information
@candiduslynx
candiduslynx committed Dec 21, 2022
commit 4747c267f50f95abf851855b2a9d47cc8adb7c85
35 changes: 14 additions & 21 deletions plugins/source/aws/resources/services/elasticsearch/vpc_endpoints_fetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/aws/aws-sdk-go-v2/service/elasticsearchservice"
"github.com/cloudquery/cloudquery/plugins/source/aws/client"
"github.com/cloudquery/cloudquery/plugins/source/aws/client/services"
"github.com/cloudquery/plugin-sdk/schema"
)

Expand All @@ -32,31 +31,25 @@ func fetchElasticsearchVpcEndpoints(ctx context.Context, meta schema.ClientMeta,
listInput.NextToken = out.NextToken
}

if len(vpcEndpointIDs) == 0 {
return nil
}

return describeVPCEndpoints(ctx, svc, res, vpcEndpointIDs)
}

func describeVPCEndpoints(ctx context.Context, svc services.ElasticsearchserviceClient, res chan<- any, vpcEndpointIDs []string) error {
// DescribeVpcEndpoints supports amounts [5, 100], so, if we have > 100 endpoints to fetch, split in halves
// slice in parts
const maxLen = 100
if l := len(vpcEndpointIDs); l > maxLen {
if err := describeVPCEndpoints(ctx, svc, res, vpcEndpointIDs[:l/2]); err != nil {
for len(vpcEndpointIDs) > 0 {
var part []string
if len(vpcEndpointIDs) > maxLen {
part, vpcEndpointIDs = vpcEndpointIDs[:maxLen], vpcEndpointIDs[maxLen:]
} else {
part, vpcEndpointIDs = vpcEndpointIDs, nil
}

out, err := svc.DescribeVpcEndpoints(ctx,
&elasticsearchservice.DescribeVpcEndpointsInput{VpcEndpointIds: part},
)
if err != nil {
return err
}
return describeVPCEndpoints(ctx, svc, res, vpcEndpointIDs[l/2:])
}

out, err := svc.DescribeVpcEndpoints(ctx,
&elasticsearchservice.DescribeVpcEndpointsInput{VpcEndpointIds: vpcEndpointIDs},
)
if err != nil {
return err
res <- out.VpcEndpoints
}

res <- out.VpcEndpoints

return nil
}