Skip to content

Commit 97f2543

Browse files
m-pizarrom-pizarro
committed
Merge branch 'alpha' into feature/CG-1203
2 parents 519d968 + 24de3a9 commit 97f2543

27 files changed

Lines changed: 530 additions & 7 deletions

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# [0.82.0-alpha.2](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.82.0-alpha.1...0.82.0-alpha.2) (2022-05-23)
2+
3+
4+
### Bug Fixes
5+
6+
* **services:** fix nat gateway service data ([1d0303e](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/1d0303ef27ec55a91eb27e015d877fbc428c211d))
7+
8+
# [0.82.0-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.81.1-alpha.1...0.82.0-alpha.1) (2022-05-23)
9+
10+
11+
### Features
12+
13+
* Add vpcEndpoint service ([a33a61f](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/a33a61f1b5cd9f0a4bc49682f0ef44e4d2880283))
14+
15+
## [0.81.1-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.81.0...0.81.1-alpha.1) (2022-05-23)
16+
17+
18+
### Bug Fixes
19+
20+
* **services:** fix route table service mainRouteTable property ([e99287b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/e99287b91828e57715d240f23a5cc0276799da12))
21+
122
# [0.81.0](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.80.0...0.81.0) (2022-05-19)
223

324

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
138138
| managedAirflow | cloudwatchLog, iamRole, kms, securityGroups, subnet, s3 |
139139
| nacl | vpc |
140140
| natGateway | networkInterface, subnet, vpc |
141-
| networkInterface | ec2, eip, efsMountTarget, natGateway, sageMakerNotebookInstance, subnet, vpc, flowLog, securityGroup |
141+
| networkInterface | ec2, eip, efsMountTarget, natGateway, sageMakerNotebookInstance, subnet, vpc, vpcEndpoint, flowLog, securityGroup |
142142
| organization |
143143
| rdsCluster | appSync, rdsClusterSnapshot, rdsDbInstance, route53HostedZone, securityGroup, subnet, iamRole, kms |
144144
| rdsClusterSnapshot | kms, rdsCluster, vpc |
@@ -152,17 +152,18 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
152152
| sageMakerProject | |
153153
| s3 | cloudfront, cloudtrail, ecsCluster, iamRole, kinesisFirehose, lambda, managedAirflow, sns, sqs |
154154
| secretsManager | kms, lambda |
155-
| securityGroup | alb, asg, clientVpnEndpoint, codebuild, dmsReplicationInstance, ecsService, lambda, ec2, elasticSearchDomain, elb, rdsCluster, rdsDbInstance, eksCluster, elastiCacheCluster, managedAirflow, sageMakerNotebookInstance, networkInterface |
155+
| securityGroup | alb, asg, clientVpnEndpoint, codebuild, dmsReplicationInstance, ecsService, lambda, ec2, elasticSearchDomain, elb, rdsCluster, rdsDbInstance, eksCluster, elastiCacheCluster, managedAirflow, sageMakerNotebookInstance, networkInterface, vpcEndpoint |
156156
| ses | |
157157
| sns | kms, cloudtrail, cloudwatch, s3 |
158158
| sqs | elasticBeanstalkEnv, s3 |
159-
| subnet | alb, asg, codebuild, dmsReplicationInstance, ec2, ecsService, efsMountTarget, elastiCacheCluster, elasticSearchDomain, elb, lambda, managedAirflow, natGateway, networkInterface, rdsCluster, sageMakerNotebookInstance, routeTable, vpc, eksCluster, emrCluster, flowLog |
159+
| subnet | alb, asg, codebuild, dmsReplicationInstance, ec2, ecsService, efsMountTarget, elastiCacheCluster, elasticSearchDomain, elb, lambda, managedAirflow, natGateway, networkInterface, rdsCluster, sageMakerNotebookInstance, routeTable, vpc, vpcEndpoint, eksCluster, emrCluster, flowLog |
160160
| systemsManagerInstance | ec2, iamRole |
161161
| systemsManagerDocument | |
162162
| transitGateway | transitGatewayAttachment, transitGatewayRouteTable, vpnConnection |
163163
| transitGatewayAttachment | transitGateway, transitGatewayRouteTable, vpc, vpnConnection |
164-
| transitGatewayRouteTable | transitGateway, transitGatewayAttachment |
165-
| vpc | alb, codebuild, dmsReplicationInstance, ec2, eip, elb, ecsService, efsMountTarget, eksCluster igw, elastiCacheCluster, elasticSearchDomain, lambda, nacl, natGateway, networkInterface, rdsClusterSnapshot, rdsDbInstance, redshiftCluster, route53HostedZone, routeTable, subnet, flowLog, vpnGateway, transitGatewayAttachment |
164+
| transitGatewayRouteTable | transitGateway, transitGatewayAttachment |
165+
| vpc | alb, codebuild, dmsReplicationInstance, ec2, eip, elb, ecsService, efsMountTarget, eksCluster igw, elastiCacheCluster, elasticSearchDomain, lambda, nacl, natGateway, networkInterface, rdsClusterSnapshot, rdsDbInstance, redshiftCluster, route53HostedZone, routeTable, subnet, flowLog, vpnGateway, transitGatewayAttachment, vpcEndpoint |
166+
| vpcEndpoint | networkInterface, routeTable, securityGroup, subnet, vpc |
166167
| vpnConnection | customerGateway, transitGateway, transitGatewayAttachment, vpnGateway |
167168
| vpnGateway | vpc, vpnConnection |
168169
| wafV2WebAcl | appSync, apiGatewayStage, alb |

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudgraph/cg-provider-aws",
3-
"version": "0.81.0",
3+
"version": "0.82.0-alpha.2",
44
"description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
55
"publishConfig": {
66
"registry": "https://registry.npmjs.org/",

‎src/enums/schemasMap.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ export default {
7979
[services.sg]: 'awsSecurityGroup',
8080
[services.subnet]: 'awsSubnet',
8181
[services.vpc]: 'awsVpc',
82+
[services.vpcEndpoint]: 'awsVpcEndpoint',
8283
[services.vpnGateway]: 'awsVpnGateway',
8384
[services.sqs]: 'awsSqs',
8485
[services.rdsCluster]: 'awsRdsCluster',

‎src/enums/serviceAliases.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ export default {
7272
[services.transitGateway]: 'transitGateways',
7373
[services.transitGatewayAttachment]: 'transitGatewayAttachments',
7474
[services.transitGatewayRouteTable]: 'transitGatewayRouteTables',
75+
[services.vpcEndpoint]: 'vpcEndpoints',
7576
[services.vpnConnection]: 'vpnConnections',
7677
}

‎src/enums/serviceMap.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ import SageMakerNotebookInstance from '../services/sageMakerNotebookInstance'
9696
import SystemsManagerInstance from '../services/systemsManagerInstance'
9797
import SystemsManagerDocument from '../services/systemsManagerDocument'
9898
import RdsClusterSnapshot from '../services/rdsClusterSnapshot'
99+
import VpcEndpoint from '../services/vpcEndpoint'
99100
import APIGatewayDomainName from '../services/apiGatewayDomainName'
100101
import APIGatewayHttpApi from '../services/apiGatewayHttpApi'
101102
import TransitGatewayRouteTable from '../services/transitGatewayRouteTable'
@@ -163,6 +164,7 @@ export default {
163164
[services.sg]: AwsSecurityGroup,
164165
[services.subnet]: AwsSubnet,
165166
[services.vpc]: VPC,
167+
[services.vpcEndpoint]: VpcEndpoint,
166168
[services.sqs]: SQS,
167169
[services.rdsCluster]: RDSCluster,
168170
[services.rdsClusterSnapshot]: RdsClusterSnapshot,

‎src/enums/services.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default {
9494
transitGatewayAttachment: 'transitGatewayAttachment',
9595
transitGatewayRouteTable: 'transitGatewayRouteTable',
9696
vpc: 'vpc',
97+
vpcEndpoint: 'vpcEndpoint',
9798
vpnConnection: 'vpnConnection',
9899
vpnGateway: 'vpnGateway',
99100
wafV2WebAcl: 'wafV2WebAcl',

‎src/properties/logger.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,10 @@ export default {
672672
* Configuration Recorder Status
673673
*/
674674
fetchedConfigurationRecorderStatus: (num: number): string => `Fetched ${num} Configuration Recorder Status`,
675+
/**
676+
* Vpc Endpoints
677+
*/
678+
fetchedVpcEndpoints: (num: number): string => `Fetched ${num} Vpc Endpoints`,
675679
/**
676680
* Access Analyzers
677681
*/

‎src/services/account/schema.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ type awsAccount implements awsOptionalService @key(fields: "id") {
9595
transitGatewayAttachments: [awsTransitGatewayAttachment]
9696
transitGatewayRouteTables: [awsTransitGatewayRouteTable]
9797
vpc: [awsVpc]
98+
vpcEndpoints: [awsVpcEndpoint]
9899
vpnConnections: [awsVpnConnection]
99100
vpnGateway: [awsVpnGateway]
100101
wafV2WebAcl: [awsWafV2WebAcl]

‎src/services/natGateway/format.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import cuid from 'cuid'
12
import { AwsNatGateway } from '../../types/generated'
23
import { formatTagsFromMap } from '../../utils/format'
34
import { natGatewayArn } from '../../utils/generateArns'
@@ -20,16 +21,27 @@ export default ({
2021
NatGatewayId: id,
2122
State: state,
2223
CreateTime: createTime,
24+
NatGatewayAddresses: natGatewayAddresses,
2325
Tags
2426
} = rawData
2527

28+
29+
const mappedAddresses = natGatewayAddresses?.map(({ AllocationId, NetworkInterfaceId, PrivateIp, PublicIp }) => ({
30+
id: cuid(),
31+
allocationId: AllocationId,
32+
networkInterfaceId: NetworkInterfaceId,
33+
privateIp: PrivateIp,
34+
publicIp: PublicIp
35+
})) ?? []
36+
2637
return {
2738
id,
2839
tags: formatTagsFromMap(Tags),
2940
accountId: account,
3041
arn: natGatewayArn({ region, account, id }),
3142
region,
3243
state,
44+
natGatewayAddresses: mappedAddresses,
3345
createTime: createTime.toUTCString(),
3446
}
3547
}

0 commit comments

Comments
 (0)