Skip to content

🧹 Reuse ec2TagsToMap and vpcFilter functions. #6329

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
chris-rock merged 3 commits into from
Dec 22, 2025
Merged

🧹 Reuse ec2TagsToMap and vpcFilter functions. #6329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4de503a
🧹 Reuse ec2TagsToMap function.
VasilSirakov Dec 22, 2025
a010431
Remove one extra function.
VasilSirakov Dec 22, 2025
e4cae17
Extract vpc filter in separate function.
VasilSirakov Dec 22, 2025
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
8 changes: 4 additions & 4 deletions providers/aws/resources/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ func Is400InstanceNotFoundError(err error) bool {
return false
}

func strMapToInterface(m map[string]string) map[string]any {
res := map[string]any{}
func toInterfaceMap(m map[string]string) map[string]any {
res := make(map[string]any)
for k, v := range m {
res[k] = v
}
Expand All @@ -111,8 +111,8 @@ func strMapToInterface(m map[string]string) map[string]any {

func toInterfaceArr(a []string) []any {
res := []any{}
for i := range a {
res = append(res, a[i])
for _, v := range a {
res = append(res, v)
}
return res
}
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/resources/aws_apigateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (a *mqlAwsApigateway) getRestApis(conn *connection.AwsConnection) []*jobpoo
"description": llx.StringData(convert.ToValue(restApi.Description)),
"createdDate": llx.TimeDataPtr(restApi.CreatedDate),
"region": llx.StringData(region),
"tags": llx.MapData(strMapToInterface(restApi.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(restApi.Tags), types.String),
})
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/resources/aws_cloudwatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ func (a *mqlAwsCloudwatch) getLogGroups(conn *connection.AwsConnection) []*jobpo
log.Debug().Interface("log_group", loggroup.LogGroupName).Msg("excluding log group due to filters")
continue
}
args["tags"] = llx.MapData(strMapToInterface(groupTags.Tags), types.String)
args["tags"] = llx.MapData(toInterfaceMap(groupTags.Tags), types.String)
} else {
log.Warn().Err(err).Interface("log_group", loggroup.LogGroupName).Msg("could not get tags for log group")
}
Expand Down
33 changes: 10 additions & 23 deletions providers/aws/resources/aws_ec2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,6 @@ func (e *mqlAwsEc2) id() (string, error) {
return ResourceAwsEc2, nil
}

func Ec2TagsToMap(tags []ec2types.Tag) map[string]any {
tagsMap := make(map[string]any)

if len(tags) > 0 {
for i := range tags {
tag := tags[i]
tagsMap[convert.ToValue(tag.Key)] = convert.ToValue(tag.Value)
}
}

return tagsMap
}

func initAwsEc2Eip(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) {
if len(args) > 2 {
return args, nil, nil
Expand Down Expand Up @@ -77,7 +64,7 @@ func initAwsEc2Eip(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[s
args["networkInterfaceOwnerId"] = llx.StringDataPtr(add.NetworkInterfaceOwnerId)
args["privateIpAddress"] = llx.StringDataPtr(add.PrivateIpAddress)
args["publicIpv4Pool"] = llx.StringDataPtr(add.PublicIpv4Pool)
args["tags"] = llx.MapData(Ec2TagsToMap(add.Tags), types.String)
args["tags"] = llx.MapData(toInterfaceMap(ec2TagsToMap(add.Tags)), types.String)
args["region"] = llx.StringData(r)
return args, nil, nil
}
Expand Down Expand Up @@ -169,7 +156,7 @@ func (a *mqlAwsEc2) getEIPs(conn *connection.AwsConnection) []*jobpool.Job {
"networkInterfaceOwnerId": llx.StringDataPtr(add.NetworkInterfaceOwnerId),
"privateIpAddress": llx.StringDataPtr(add.PrivateIpAddress),
"publicIpv4Pool": llx.StringDataPtr(add.PublicIpv4Pool),
"tags": llx.MapData(Ec2TagsToMap(add.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(add.Tags)), types.String),
"region": llx.StringData(region),
}
mqlAddress, err := CreateResource(a.MqlRuntime, ResourceAwsEc2Eip, args)
Expand Down Expand Up @@ -262,7 +249,7 @@ func (a *mqlAwsEc2) getNetworkACLs(conn *connection.AwsConnection) []*jobpool.Jo
"id": llx.StringDataPtr(acl.NetworkAclId),
"region": llx.StringData(region),
"isDefault": llx.BoolDataPtr(acl.IsDefault),
"tags": llx.MapData(Ec2TagsToMap(acl.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(acl.Tags)), types.String),
"associations": llx.ArrayData(assoc, types.Type(ResourceAwsEc2NetworkaclAssociation)),
})
if err != nil {
Expand Down Expand Up @@ -416,7 +403,7 @@ func (a *mqlAwsEc2) getSecurityGroups(conn *connection.AwsConnection) []*jobpool
"id": llx.StringDataPtr(group.GroupId),
"name": llx.StringDataPtr(group.GroupName),
"description": llx.StringDataPtr(group.Description),
"tags": llx.MapData(Ec2TagsToMap(group.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(group.Tags)), types.String),
"region": llx.StringData(region),
}

Expand Down Expand Up @@ -609,7 +596,7 @@ func (a *mqlAwsEc2) getKeypairs(conn *connection.AwsConnection) []*jobpool.Job {
"fingerprint": llx.StringDataPtr(kp.KeyFingerprint),
"name": llx.StringDataPtr(kp.KeyName),
"type": llx.StringData(string(kp.KeyType)),
"tags": llx.MapData(Ec2TagsToMap(kp.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(kp.Tags)), types.String),
"region": llx.StringData(region),
"createdAt": llx.TimeDataPtr(kp.CreateTime),
})
Expand Down Expand Up @@ -664,7 +651,7 @@ func initAwsEc2Keypair(runtime *plugin.Runtime, args map[string]*llx.RawData) (m
args["fingerprint"] = llx.StringData(convert.ToValue(kp.KeyFingerprint))
args["name"] = llx.StringData(convert.ToValue(kp.KeyName))
args["type"] = llx.StringData(string(kp.KeyType))
args["tags"] = llx.MapData(Ec2TagsToMap(kp.Tags), types.String)
args["tags"] = llx.MapData(toInterfaceMap(ec2TagsToMap(kp.Tags)), types.String)
args["region"] = llx.StringData(r)
args["arn"] = llx.StringData(fmt.Sprintf(keypairArnPattern, conn.AccountId(), r, convert.ToValue(kp.KeyPairId)))
args["createdAt"] = llx.TimeDataPtr(kp.CreateTime)
Expand Down Expand Up @@ -892,7 +879,7 @@ func (a *mqlAwsEc2) gatherInstanceInfo(instances []ec2types.Instance, regionVal
// "iamInstanceProfile": llx.MapData(iamInstanceProfile, types.Any),
"stateTransitionReason": llx.StringDataPtr(instance.StateTransitionReason),
"stateTransitionTime": llx.TimeData(stateTransitionTime),
"tags": llx.MapData(Ec2TagsToMap(instance.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(instance.Tags)), types.String),
"tpmSupport": llx.StringDataPtr(instance.TpmSupport),
}

Expand Down Expand Up @@ -955,7 +942,7 @@ func (i *mqlAwsEc2Instance) networkInterfaces() ([]any, error) {
"requesterManaged": llx.BoolDataPtr(networkingInterface.RequesterManaged),
"sourceDestCheck": llx.BoolDataPtr(networkingInterface.SourceDestCheck),
"status": llx.StringData(string(networkingInterface.Status)),
"tags": llx.MapData(Ec2TagsToMap(networkingInterface.TagSet), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(networkingInterface.TagSet)), types.String),
}
mqlNetworkInterface, err := CreateResource(i.MqlRuntime, ResourceAwsEc2Networkinterface, args)
if err != nil {
Expand Down Expand Up @@ -1393,7 +1380,7 @@ func (a *mqlAwsEc2) getVolumes(conn *connection.AwsConnection) []*jobpool.Job {
"region": llx.StringData(region),
"size": llx.IntDataDefault(vol.Size, 0),
"state": llx.StringData(string(vol.State)),
"tags": llx.MapData(Ec2TagsToMap(vol.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(vol.Tags)), types.String),
"throughput": llx.IntDataDefault(vol.Throughput, 0),
"volumeType": llx.StringData(string(vol.VolumeType)),
})
Expand Down Expand Up @@ -1692,7 +1679,7 @@ func (a *mqlAwsEc2) getSnapshots(conn *connection.AwsConnection) []*jobpool.Job
"startTime": llx.TimeDataPtr(snapshot.StartTime),
"state": llx.StringData(string(snapshot.State)),
"storageTier": llx.StringData(string(snapshot.StorageTier)),
"tags": llx.MapData(Ec2TagsToMap(snapshot.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(snapshot.Tags)), types.String),
"volumeId": llx.StringDataPtr(snapshot.VolumeId),
"volumeSize": llx.IntDataDefault(snapshot.VolumeSize, 0),
})
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/resources/aws_eks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (a *mqlAwsEks) getClusters(conn *connection.AwsConnection) []*jobpool.Job {
"resourcesVpcConfig": llx.MapData(vpcConfig, types.Any),
"status": llx.StringData(string(cluster.Status)),
"supportType": llx.StringData(string(cluster.UpgradePolicy.SupportType)),
"tags": llx.MapData(strMapToInterface(cluster.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(cluster.Tags), types.String),
"version": llx.StringDataPtr(cluster.Version),
"deletionProtection": llx.BoolDataPtr(cluster.DeletionProtection),
}
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/resources/aws_iam_accessanalyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (a *mqlAwsIamAccessAnalyzer) getAnalyzers(conn *connection.AwsConnection) [
"status": llx.StringData(string(analyzer.Status)),
"type": llx.StringData(string(analyzer.Type)),
"region": llx.StringData(region),
"tags": llx.MapData(strMapToInterface(analyzer.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(analyzer.Tags), types.String),
"createdAt": llx.TimeDataPtr(analyzer.CreatedAt),
"lastResourceAnalyzed": llx.StringDataPtr(analyzer.LastResourceAnalyzed),
"lastResourceAnalyzedAt": llx.TimeDataPtr(analyzer.LastResourceAnalyzedAt),
Expand Down
10 changes: 1 addition & 9 deletions providers/aws/resources/aws_inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (a *mqlAwsInspectorCoverage) ec2Instance() (*mqlAwsInspectorCoverageInstanc
conn := a.MqlRuntime.Connection.(*connection.AwsConnection)
args := map[string]*llx.RawData{
"platform": llx.StringData(string(a.cacheCoverage.ResourceMetadata.Ec2.Platform)),
"tags": llx.MapData(mapConversion(a.cacheCoverage.ResourceMetadata.Ec2.Tags), llxtypes.String),
"tags": llx.MapData(toInterfaceMap(a.cacheCoverage.ResourceMetadata.Ec2.Tags), llxtypes.String),
"region": llx.StringData(a.Region.Data),
}
image, err := NewResource(a.MqlRuntime, "aws.ec2.image", map[string]*llx.RawData{
Expand All @@ -139,14 +139,6 @@ func (a *mqlAwsInspectorCoverage) ec2Instance() (*mqlAwsInspectorCoverageInstanc
return nil, nil
}

func mapConversion(m map[string]string) map[string]any {
newMap := make(map[string]any)
for k, v := range m {
newMap[k] = v
}
return newMap
}

func listMapConversion(m []string) map[string]any {
newMap := make(map[string]any)
for _, k := range m {
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/resources/aws_lambda.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (a *mqlAwsLambda) getFunctions(conn *connection.AwsConnection) []*jobpool.J
"dlqTargetArn": llx.StringData(dlqTarget),
"vpcConfig": llx.MapData(vpcConfigJson, types.Any),
"region": llx.StringData(region),
"tags": llx.MapData(strMapToInterface(tags), types.String),
"tags": llx.MapData(toInterfaceMap(tags), types.String),
})
if err != nil {
return nil, err
Expand Down
41 changes: 24 additions & 17 deletions providers/aws/resources/aws_vpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (a *mqlAws) getVpcs(conn *connection.AwsConnection) []*jobpool.Job {
"name": llx.StringData(name),
"region": llx.StringData(region),
"state": llx.StringData(string(vpc.State)),
"tags": llx.MapData(Ec2TagsToMap(vpc.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(vpc.Tags)), types.String),
})
if err != nil {
log.Error().Msg(err.Error())
Expand Down Expand Up @@ -167,14 +167,14 @@ func (a *mqlAwsVpcNatgatewayAddress) publicIp() (*mqlAwsEc2Eip, error) {

func (a *mqlAwsVpc) natGateways() ([]any, error) {
conn := a.MqlRuntime.Connection.(*connection.AwsConnection)
vpc := a.Id.Data
vpcId := a.Id.Data

svc := conn.Ec2(a.Region.Data)
ctx := context.Background()
endpoints := []any{}

filters := conn.Filters.General.ToServerSideEc2Filters()
filters = append(filters, vpctypes.Filter{Name: aws.String("vpc-id"), Values: []string{vpc}})
filters = append(filters, vpcFilter(vpcId))
params := &ec2.DescribeNatGatewaysInput{Filter: filters}
paginator := ec2.NewDescribeNatGatewaysPaginator(svc, params)
for paginator.HasMorePages() {
Expand Down Expand Up @@ -212,7 +212,7 @@ func (a *mqlAwsVpc) natGateways() ([]any, error) {
"createdAt": llx.TimeDataPtr(gw.CreateTime),
"natGatewayId": llx.StringDataPtr(gw.NatGatewayId),
"state": llx.StringData(string(gw.State)),
"tags": llx.MapData(Ec2TagsToMap(gw.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(gw.Tags)), types.String),
"addresses": llx.ArrayData(addresses, types.Type(ResourceAwsVpcNatgatewayAddress)),
}

Expand Down Expand Up @@ -242,7 +242,7 @@ func (a *mqlAwsVpc) endpoints() ([]any, error) {
endpoints := []any{}

filters := conn.Filters.General.ToServerSideEc2Filters()
filters = append(filters, vpctypes.Filter{Name: aws.String("vpc-id"), Values: []string{vpcId}})
filters = append(filters, vpcFilter(vpcId))
params := &ec2.DescribeVpcEndpointsInput{Filters: filters}
paginator := ec2.NewDescribeVpcEndpointsPaginator(svc, params)
for paginator.HasMorePages() {
Expand Down Expand Up @@ -298,7 +298,7 @@ func (a *mqlAwsVpc) serviceEndpoints() ([]any, error) {
)

filters := conn.Filters.General.ToServerSideEc2Filters()
filters = append(filters, vpctypes.Filter{Name: aws.String("vpc-id"), Values: []string{vpcID}})
filters = append(filters, vpcFilter(vpcID))
paginator := ec2.NewDescribeVpcEndpointsPaginator(svc, &ec2.DescribeVpcEndpointsInput{Filters: filters})
for paginator.HasMorePages() {
resp, err := paginator.NextPage(ctx)
Expand All @@ -320,7 +320,7 @@ func (a *mqlAwsVpc) serviceEndpoints() ([]any, error) {
"id": llx.StringDataPtr(endpoint.VpcEndpointId),
"name": llx.StringDataPtr(endpoint.ServiceName),
"type": llx.StringData(string(endpoint.VpcEndpointType)),
"tags": llx.MapData(Ec2TagsToMap(endpoint.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(endpoint.Tags)), types.String),
"dnsNames": llx.ArrayData(dnsNames, types.String),
"owner": llx.StringDataPtr(endpoint.OwnerId),
},
Expand Down Expand Up @@ -458,12 +458,12 @@ func (a *mqlAwsVpc) peeringConnections() ([]any, error) {
if peerconn.Status != nil {
status = *peerconn.Status.Message
}
mqlPeerConn, err := CreateResource(a.MqlRuntime, "aws.vpc.peeringConnection",
mqlPeerConn, err := CreateResource(a.MqlRuntime, ResourceAwsVpcPeeringConnection,
map[string]*llx.RawData{
"expirationTime": llx.TimeDataPtr(peerconn.ExpirationTime),
"id": llx.StringDataPtr(peerconn.VpcPeeringConnectionId),
"status": llx.StringData(status),
"tags": llx.MapData(Ec2TagsToMap(peerconn.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(peerconn.Tags)), types.String),
},
)
if err != nil {
Expand Down Expand Up @@ -496,7 +496,7 @@ func (a *mqlAwsVpcPeeringConnection) acceptorVpc() (*mqlAwsVpcPeeringConnectionP
for i := range acceptor.Ipv6CidrBlockSet {
ipv6 = append(ipv6, *acceptor.Ipv6CidrBlockSet[i].Ipv6CidrBlock)
}
mql, err := CreateResource(a.MqlRuntime, "aws.vpc.peeringConnection.peeringVpc",
mql, err := CreateResource(a.MqlRuntime, ResourceAwsVpcPeeringConnectionPeeringVpc,
map[string]*llx.RawData{
"allowDnsResolutionFromRemoteVpc": llx.BoolDataPtr(acceptor.PeeringOptions.AllowDnsResolutionFromRemoteVpc),
"ipv4CiderBlocks": llx.ArrayData(ipv4, types.String),
Expand All @@ -515,7 +515,7 @@ func (a *mqlAwsVpcPeeringConnection) acceptorVpc() (*mqlAwsVpcPeeringConnectionP

func (a *mqlAwsVpcPeeringConnectionPeeringVpc) vpc() (*mqlAwsVpc, error) {
conn := a.MqlRuntime.Connection.(*connection.AwsConnection)
res, err := NewResource(a.MqlRuntime, "aws.vpc", map[string]*llx.RawData{"arn": llx.StringData(fmt.Sprintf(vpcArnPattern, a.Region.Data, conn.AccountId(), a.VpcId.Data))})
res, err := NewResource(a.MqlRuntime, ResourceAwsVpc, map[string]*llx.RawData{"arn": llx.StringData(fmt.Sprintf(vpcArnPattern, a.Region.Data, conn.AccountId(), a.VpcId.Data))})
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -567,7 +567,7 @@ func (a *mqlAwsVpc) flowLogs() ([]any, error) {
}

for _, flowLog := range flowLogsRes.FlowLogs {
mqlFlowLog, err := CreateResource(a.MqlRuntime, "aws.vpc.flowlog",
mqlFlowLog, err := CreateResource(a.MqlRuntime, ResourceAwsVpcFlowlog,
map[string]*llx.RawData{
"createdAt": llx.TimeDataPtr(flowLog.CreationTime),
"destination": llx.StringDataPtr(flowLog.LogDestination),
Expand All @@ -577,7 +577,7 @@ func (a *mqlAwsVpc) flowLogs() ([]any, error) {
"maxAggregationInterval": llx.IntDataDefault(flowLog.MaxAggregationInterval, 0),
"region": llx.StringData(a.Region.Data),
"status": llx.StringDataPtr(flowLog.FlowLogStatus),
"tags": llx.MapData(Ec2TagsToMap(flowLog.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(flowLog.Tags)), types.String),
"trafficType": llx.StringData(string(flowLog.TrafficType)),
"vpc": llx.StringData(vpc),
},
Expand All @@ -604,7 +604,7 @@ func (a *mqlAwsVpc) routeTables() ([]any, error) {
res := []any{}

filters := conn.Filters.General.ToServerSideEc2Filters()
filters = append(filters, vpctypes.Filter{Name: aws.String("vpc-id"), Values: []string{vpcVal}})
filters = append(filters, vpcFilter(vpcVal))
params := &ec2.DescribeRouteTablesInput{Filters: filters}
paginator := ec2.NewDescribeRouteTablesPaginator(svc, params)
for paginator.HasMorePages() {
Expand All @@ -627,7 +627,7 @@ func (a *mqlAwsVpc) routeTables() ([]any, error) {
map[string]*llx.RawData{
"id": llx.StringDataPtr(routeTable.RouteTableId),
"routes": llx.ArrayData(dictRoutes, types.Any),
"tags": llx.MapData(Ec2TagsToMap(routeTable.Tags), types.String),
"tags": llx.MapData(toInterfaceMap(ec2TagsToMap(routeTable.Tags)), types.String),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -677,7 +677,7 @@ type mqlAwsVpcRoutetableAssociationInternal struct {
func (a *mqlAwsVpcRoutetableAssociation) subnet() (*mqlAwsVpcSubnet, error) {
if a.cacheSubnetId != nil {
conn := a.MqlRuntime.Connection.(*connection.AwsConnection)
res, err := NewResource(a.MqlRuntime, "aws.vpc.subnet", map[string]*llx.RawData{"arn": llx.StringData(fmt.Sprintf(subnetArnPattern, a.region, conn.AccountId(), convert.ToValue(a.cacheSubnetId)))})
res, err := NewResource(a.MqlRuntime, ResourceAwsVpcSubnet, map[string]*llx.RawData{"arn": llx.StringData(fmt.Sprintf(subnetArnPattern, a.region, conn.AccountId(), convert.ToValue(a.cacheSubnetId)))})
if err != nil {
a.Subnet.State = plugin.StateIsNull | plugin.StateIsSet
return nil, err
Expand All @@ -701,7 +701,7 @@ func (a *mqlAwsVpc) subnets() ([]any, error) {
res := []any{}

filters := conn.Filters.General.ToServerSideEc2Filters()
filters = append(filters, vpctypes.Filter{Name: aws.String("vpc-id"), Values: []string{vpcVal}})
filters = append(filters, vpcFilter(vpcVal))
params := &ec2.DescribeSubnetsInput{Filters: filters}
paginator := ec2.NewDescribeSubnetsPaginator(svc, params)
for paginator.HasMorePages() {
Expand Down Expand Up @@ -844,3 +844,10 @@ func initAwsVpc(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[stri

return nil, nil, errors.New("vpc does not exist")
}

func vpcFilter(vpcId string) vpctypes.Filter {
return vpctypes.Filter{
Name: aws.String("vpc-id"),
Values: []string{vpcId},
}
}
Loading