Merge branch 'alpha' into feature/CG-1203

m-pizarro · m-pizarro · commit f88c3cc281fa · 2022-05-24T17:12:54.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [0.82.0-alpha.3](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.82.0-alpha.2...0.82.0-alpha.3) (2022-05-24)
+
+
+### Features
+
+* **services:** Add service vpcPeeringConnection ([b5bda76](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/b5bda76de47268f12390b4f554067e6347187da3))
+
 # [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)
 
 
diff --git a/README.md b/README.md
@@ -160,10 +160,11 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
 | systemsManagerInstance      | ec2, iamRole                                                                                                                                                                                                                                                                                                                                                                  |
 | systemsManagerDocument      |                                                                                                                                                                                                                                                                                                                                                                               |
 | transitGateway              | transitGatewayAttachment, transitGatewayRouteTable, vpnConnection                                                                                                                                                                                                                                                                                                                           |
-| transitGatewayAttachment    | transitGateway, transitGatewayRouteTable, vpc, vpnConnection                                                                                                                                                                                                                                                                                                                           |
+| transitGatewayAttachment    | transitGateway, transitGatewayRouteTable, vpc, vpnConnection                                                                                                                                                                                                                                                                                                                                |
 | transitGatewayRouteTable    | transitGateway, transitGatewayAttachment                                                                                                                                                                                                                                                                                                                |
-| 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                                              |
+| 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, vpcPeeringConnection                                              |
 | vpcEndpoint                 | networkInterface, routeTable, securityGroup, subnet, vpc                                                                                                                                                                                                                                                                                                                                                             |
+| vpcPeeringConnection        | vpc                                                                                                                                                                                                                                                                                                                           |
 | vpnConnection               | customerGateway, transitGateway, transitGatewayAttachment, vpnGateway                                                                                                                                                                                                                                                                                                         |
 | vpnGateway                  | vpc, vpnConnection                                                                                                                                                                                                                                                                                                                                                            |
 | wafV2WebAcl                 | appSync, apiGatewayStage, alb                                                                                                                                                                                                                                                                                                                                                 |
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.82.0-alpha.2",
+  "version": "0.82.0-alpha.3",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
diff --git a/src/enums/schemasMap.ts b/src/enums/schemasMap.ts
@@ -80,6 +80,7 @@ export default {
   [services.subnet]: 'awsSubnet',
   [services.vpc]: 'awsVpc',
   [services.vpcEndpoint]: 'awsVpcEndpoint',
+  [services.vpcPeeringConnection]: 'awsVpcPeeringConnection',
   [services.vpnGateway]: 'awsVpnGateway',
   [services.sqs]: 'awsSqs',
   [services.rdsCluster]: 'awsRdsCluster',
diff --git a/src/enums/serviceAliases.ts b/src/enums/serviceAliases.ts
@@ -74,4 +74,5 @@ export default {
   [services.transitGatewayRouteTable]: 'transitGatewayRouteTables',
   [services.vpcEndpoint]: 'vpcEndpoints',
   [services.vpnConnection]: 'vpnConnections',
+  [services.vpcPeeringConnection]: 'vpcPeeringConnections',
 }
diff --git a/src/enums/serviceMap.ts b/src/enums/serviceMap.ts
@@ -100,6 +100,7 @@ import VpcEndpoint from '../services/vpcEndpoint'
 import APIGatewayDomainName from '../services/apiGatewayDomainName'
 import APIGatewayHttpApi from '../services/apiGatewayHttpApi'
 import TransitGatewayRouteTable from '../services/transitGatewayRouteTable'
+import VpcPeeringConnection from '../services/vpcPeeringConnection'
 
 /**
  * serviceMap is an object that contains all currently supported services for AWS
@@ -165,6 +166,7 @@ export default {
   [services.subnet]: AwsSubnet,
   [services.vpc]: VPC,
   [services.vpcEndpoint]: VpcEndpoint,
+  [services.vpcPeeringConnection]: VpcPeeringConnection,
   [services.sqs]: SQS,
   [services.rdsCluster]: RDSCluster,
   [services.rdsClusterSnapshot]: RdsClusterSnapshot,
diff --git a/src/enums/services.ts b/src/enums/services.ts
@@ -95,6 +95,7 @@ export default {
   transitGatewayRouteTable: 'transitGatewayRouteTable',
   vpc: 'vpc',
   vpcEndpoint: 'vpcEndpoint',
+  vpcPeeringConnection: 'vpcPeeringConnection',
   vpnConnection: 'vpnConnection',
   vpnGateway: 'vpnGateway',
   wafV2WebAcl: 'wafV2WebAcl',
diff --git a/src/properties/logger.ts b/src/properties/logger.ts
@@ -680,4 +680,8 @@ export default {
    * Access Analyzers
    */
   fetchedaccessAnalyzers: (num: number): string => `Found ${num} Access Analyzers`,
+  /**
+   * Vpc Peering Connections
+   */
+  fetchedVpcPeeringConnections: (num: number): string => `Found ${num} Vpc Peering Connections`,
 }
diff --git a/src/services/account/schema.graphql b/src/services/account/schema.graphql
@@ -96,6 +96,7 @@ type awsAccount implements awsOptionalService @key(fields: "id") {
   transitGatewayRouteTables: [awsTransitGatewayRouteTable]
   vpc: [awsVpc]
   vpcEndpoints: [awsVpcEndpoint]
+  vpcPeeringConnections: [awsVpcPeeringConnection]
   vpnConnections: [awsVpnConnection]
   vpnGateway: [awsVpnGateway]
   wafV2WebAcl: [awsWafV2WebAcl]
diff --git a/src/services/tag/connections.ts b/src/services/tag/connections.ts
@@ -70,6 +70,7 @@ import { RawAwsApiGatewayHttpApi } from '../apiGatewayHttpApi/data'
 import { RawAwsApiGatewayDomainName } from '../apiGatewayDomainName/data'
 import { RawAwsAnalyzerSummary } from '../iamAccessAnalyzer/data'
 import { RawAwsTransitGatewayRouteTable } from '../transitGatewayRouteTable/data'
+import { RawAwsVpcPeeringConnection } from '../vpcPeeringConnection/data'
 
 const findServiceInstancesWithTag = (tag: any, service: any): any => {
   const { id } = tag
@@ -1809,6 +1810,32 @@ export default ({
       }
     }
 
+    /**
+     * Find related Vpc Peering Connections
+     */
+     const vpcPeeringConnections: {
+      name: string
+      data: { [property: string]: RawAwsVpcPeeringConnection[] }
+    } = data.find(({ name }) => name === services.vpcPeeringConnection)
+    if (vpcPeeringConnections?.data?.[region]) {
+      const dataAtRegion = findServiceInstancesWithTag(
+        tag,
+        vpcPeeringConnections.data[region]
+      )
+      if (!isEmpty(dataAtRegion)) {
+        for (const instance of dataAtRegion) {
+          const { VpcPeeringConnectionId: id }: RawAwsVpcPeeringConnection = instance
+
+          connections.push({
+            id,
+            resourceType: services.vpcPeeringConnection,
+            relation: 'child',
+            field: 'vpcPeeringConnections',
+          })
+        }
+      }
+    }
+
     /**
      * Find related Transit Gateway Route tables
      */
diff --git a/src/services/tag/schema.graphql b/src/services/tag/schema.graphql
@@ -73,6 +73,7 @@ type awsTag @key(fields: "id") {
   elasticSearchDomains: [awsElasticSearchDomain]
   dmsReplicationInstances: [awsDmsReplicationInstance]
   systemsManagerDocuments: [awsSystemsManagerDocument]
+  vpcPeeringConnections: [awsVpcPeeringConnection]
   vpcEndpoints: [awsVpcEndpoint]
 }
 
diff --git a/src/services/vpc/schema.graphql b/src/services/vpc/schema.graphql
@@ -32,5 +32,6 @@ type awsVpc implements awsBaseService @key(fields: "id") {
   elasticSearchDomains: [awsElasticSearchDomain] @hasInverse(field: vpc)
   dmsReplicationInstances: [awsDmsReplicationInstance] @hasInverse(field: vpc)
   rdsClusterSnapshots: [awsRdsClusterSnapshot] @hasInverse(field: vpc)
+  vpcPeeringConnection: [awsVpcPeeringConnection] @hasInverse(field: vpc)
   vpcEndpoints: [awsVpcEndpoint] @hasInverse(field: vpc)
 }
diff --git a/src/services/vpcPeeringConnection/connections.ts b/src/services/vpcPeeringConnection/connections.ts
@@ -0,0 +1,60 @@
+import isEmpty from 'lodash/isEmpty'
+import { ServiceConnection } from '@cloudgraph/sdk'
+import services from '../../enums/services'
+import { RawAwsVpcPeeringConnection } from './data'
+import { RawAwsVpc } from '../vpc/data'
+
+/**
+ * Vpc Peering Connection
+ */
+
+export default ({
+  service: vpcPeeringConnection,
+  data,
+  region,
+}: {
+  account: string
+  data: { name: string; data: { [property: string]: any[] } }[]
+  service: RawAwsVpcPeeringConnection
+  region: string
+}): { [key: string]: ServiceConnection[] } => {
+  const connections: ServiceConnection[] = []
+  const {
+    VpcPeeringConnectionId: id,
+    AccepterVpcInfo: accepterVpcInfo,
+    RequesterVpcInfo: requesterVpcInfo,
+  } = vpcPeeringConnection
+
+  /**
+   * Find VPCs
+   * related to this Vpc Peering Connection
+   */
+  const vpcs: {
+    name: string
+    data: { [property: string]: any[] }
+  } = data.find(({ name }) => name === services.vpc)
+
+  if (vpcs?.data?.[region]) {
+    const dataAtRegion: RawAwsVpc[] = vpcs.data[region].filter(
+      ({ VpcId }: RawAwsVpc) =>
+        VpcId === accepterVpcInfo?.VpcId || VpcId === requesterVpcInfo?.VpcId
+    )
+
+    if (!isEmpty(dataAtRegion)) {
+      for (const vpc of dataAtRegion) {
+        const { VpcId }: RawAwsVpc = vpc
+        connections.push({
+          id: VpcId,
+          resourceType: services.vpc,
+          relation: 'child',
+          field: 'vpc',
+        })
+      }
+    }
+  }
+
+  const vpcPeeringConnectionResult = {
+    [id]: connections,
+  }
+  return vpcPeeringConnectionResult
+}
diff --git a/src/services/vpcPeeringConnection/data.ts b/src/services/vpcPeeringConnection/data.ts
@@ -0,0 +1,134 @@
+import CloudGraph from '@cloudgraph/sdk'
+import groupBy from 'lodash/groupBy'
+import isEmpty from 'lodash/isEmpty'
+
+import EC2, {
+  DescribeVpcPeeringConnectionsRequest,
+  DescribeVpcPeeringConnectionsResult,
+  VpcPeeringConnection,
+} from 'aws-sdk/clients/ec2'
+
+import { Config } from 'aws-sdk/lib/config'
+import { AWSError } from 'aws-sdk/lib/error'
+import { AwsTag, TagMap } from '../../types'
+import awsLoggerText from '../../properties/logger'
+import { initTestEndpoint } from '../../utils'
+import { convertAwsTagsToTagMap } from '../../utils/format'
+import AwsErrorLog from '../../utils/errorLog'
+
+const lt = { ...awsLoggerText }
+const { logger } = CloudGraph
+const serviceName = 'Vpc Peering Connection'
+const errorLog = new AwsErrorLog(serviceName)
+const endpoint = initTestEndpoint(serviceName)
+
+const listVpcPeeringConnectionsData = async ({
+  ec2,
+  resolveRegion,
+}: {
+  ec2: EC2
+  resolveRegion: () => void
+}): Promise<VpcPeeringConnection[]> =>
+  new Promise<VpcPeeringConnection[]>(resolve => {
+    const vpcPeeringConnectionsList: VpcPeeringConnection[] = []
+    let args: DescribeVpcPeeringConnectionsRequest = {}
+
+    const listVpcPeeringConnections = (token?: string): void => {
+      if (token) {
+        args = { ...args, NextToken: token }
+      }
+      try {
+        ec2.describeVpcPeeringConnections(
+          args,
+          (err: AWSError, data: DescribeVpcPeeringConnectionsResult) => {
+            if (err) {
+              errorLog.generateAwsErrorLog({
+                functionName: 'ec2:describeVpcPeeringConnections',
+                err,
+              })
+            }
+
+            if (isEmpty(data)) {
+              return resolveRegion()
+            }
+
+            const {
+              NextToken: nextToken,
+              VpcPeeringConnections: vpcPeeringConnections = [],
+            } = data
+
+            if (isEmpty(vpcPeeringConnections)) {
+              return resolveRegion()
+            }
+
+            vpcPeeringConnectionsList.push(...vpcPeeringConnections)
+
+            logger.debug(
+              lt.fetchedVpcPeeringConnections(vpcPeeringConnections.length)
+            )
+
+            if (nextToken) {
+              listVpcPeeringConnections(nextToken)
+            } else {
+              resolve(vpcPeeringConnectionsList)
+            }
+          }
+        )
+      } catch (error) {
+        resolve([])
+      }
+    }
+    listVpcPeeringConnections()
+  })
+
+/**
+ * Vpc Peering Connection
+ */
+export interface RawAwsVpcPeeringConnection
+  extends Omit<VpcPeeringConnection, 'Tags'> {
+  region: string
+  Tags?: TagMap
+}
+
+export default async ({
+  regions,
+  config,
+}: {
+  regions: string
+  config: Config
+}): Promise<{
+  [region: string]: RawAwsVpcPeeringConnection[]
+}> =>
+  new Promise(async resolve => {
+    const vpcPeeringConnectionsResult: RawAwsVpcPeeringConnection[] = []
+
+    const regionPromises = regions.split(',').map(region => {
+      const ec2 = new EC2({ ...config, region, endpoint })
+
+      return new Promise<void>(async resolveRegion => {
+        const vpcPeeringConnections = await listVpcPeeringConnectionsData({
+          ec2,
+          resolveRegion,
+        })
+
+        if (!isEmpty(vpcPeeringConnections)) {
+          for (const vpcPeeringConnection of vpcPeeringConnections) {
+            vpcPeeringConnectionsResult.push({
+              ...vpcPeeringConnection,
+              region,
+              Tags: convertAwsTagsToTagMap(
+                vpcPeeringConnection.Tags as AwsTag[]
+              ),
+            })
+          }
+        }
+
+        resolveRegion()
+      })
+    })
+
+    await Promise.all(regionPromises)
+    errorLog.reset()
+
+    resolve(groupBy(vpcPeeringConnectionsResult, 'region'))
+  })
diff --git a/src/services/vpcPeeringConnection/format.ts b/src/services/vpcPeeringConnection/format.ts
diff --git a/src/services/vpcPeeringConnection/index.ts b/src/services/vpcPeeringConnection/index.ts
diff --git a/src/services/vpcPeeringConnection/mutation.ts b/src/services/vpcPeeringConnection/mutation.ts
diff --git a/src/services/vpcPeeringConnection/schema.graphql b/src/services/vpcPeeringConnection/schema.graphql
diff --git a/src/types/generated.ts b/src/types/generated.ts
diff --git a/src/utils/generateArns.ts b/src/utils/generateArns.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@cloudgraph/cg-provider-aws",`
`3`		`- "version": "0.82.0-alpha.2",`
	`3`	`+ "version": "0.82.0-alpha.3",`
`4`	`4`	`"description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",`
`5`	`5`	`"publishConfig": {`
`6`	`6`	`"registry": "https://registry.npmjs.org/",`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,5 @@ export default {`
`74`	`74`	`[services.transitGatewayRouteTable]: 'transitGatewayRouteTables',`
`75`	`75`	`[services.vpcEndpoint]: 'vpcEndpoints',`
`76`	`76`	`[services.vpnConnection]: 'vpnConnections',`
	`77`	`+ [services.vpcPeeringConnection]: 'vpcPeeringConnections',`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -680,4 +680,8 @@ export default {`
`680`	`680`	`* Access Analyzers`
`681`	`681`	`*/`
`682`	`682`	fetchedaccessAnalyzers: (num: number): string => `Found ${num} Access Analyzers`,
	`683`	`+ /**`
	`684`	`+ * Vpc Peering Connections`
	`685`	`+ */`
	`686`	+ fetchedVpcPeeringConnections: (num: number): string => `Found ${num} Vpc Peering Connections`,
`683`	`687`	`}`