Merge pull request #133 from cloudgraphdev/alpha

tyler-dunkel · web-flow · commit 3980b860f750 · 2023-05-12T10:15:33.000-05:00
Beta release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# [0.88.0-alpha.2](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.88.0-alpha.1...0.88.0-alpha.2) (2023-05-12)
+
+
+### Bug Fixes
+
+* **aws:** minor change to normalize name ([07a9c02](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/07a9c027d5a0946365ebe46ac18bbae72ad7d7b9))
+
+
+### Features
+
+* **aws:** Added some adjustment needed for TF ([fb8b1c5](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/fb8b1c5af21999756c4c2720e9cb6fb5e60e858d))
+
+# [0.88.0-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.87.0...0.88.0-alpha.1) (2023-05-03)
+
+
+### Features
+
+* add new regions ([d1bd407](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/d1bd40793f018fbb95202b9e319057348fadd153))
+
+# [0.87.0](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.86.1...0.87.0) (2023-04-28)
+
+
+### Features
+
+* **CG-1340:** support aws ACM service ([8a28932](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/8a28932544e079ad45ecb0fc071cdf5f42546fc2))
+* **CG-1341:** support aws msk cluster ([696e972](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/696e9727182328e701335ba6fbc81813f8657c66))
+
 # [0.87.0-beta.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.86.1...0.87.0-beta.1) (2023-04-28)
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.87.0-beta.1",
+  "version": "0.88.0-alpha.2",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
diff --git a/src/enums/regions.ts b/src/enums/regions.ts
@@ -8,19 +8,25 @@ export const regionMap = {
   caCentral1: 'ca-central-1', // Canada Central
   apEast1: 'ap-east-1', // Hong Kong
   apSouth1: 'ap-south-1', // Mumbai
+  apSouth2: 'ap-south-2', // Hyderabad
   apNortheast1: 'ap-northeast-1', // Tokyo
   apNortheast2: 'ap-northeast-2', // Seoul
   apNortheast3: 'ap-northeast-3', // Osaka-Local
   apSoutheast1: 'ap-southeast-1', // Singapore
   apSoutheast2: 'ap-southeast-2', // Sydney
+  apSoutheast3: 'ap-southeast-3', // Jakarta
+  apSoutheast4: 'ap-southeast-4', // Melbourne
   afSouth1: 'af-south-1', // Africa (cape town)
   euCentral1: 'eu-central-1', // Frankfurt
+  euCentral2: 'eu-central-2', // Zurich
   euWest1: 'eu-west-1', // Ireland
   euWest2: 'eu-west-2', // London
   euWest3: 'eu-west-3', // Paris
   euSouth1: 'eu-south-1', // Milan
+  euSouth2: 'eu-south-2', // Spain
   euNorth1: 'eu-north-1', // Stockholm
   meSouth1: 'me-south-1', // Bahrain
+  meCentral1: 'me-central-1', // UAE
   saEast1: 'sa-east-1', // Sao Paulo
   usGovEast1: 'us-gov-east-1', // US-East
   usGovWest1: 'us-gov-west-1', // US-west
@@ -36,19 +42,25 @@ const {
   caCentral1,
   apEast1,
   apSouth1,
+  apSouth2,
   apNortheast1,
   apNortheast2,
   apNortheast3,
   apSoutheast1,
   apSoutheast2,
+  apSoutheast3,
+  apSoutheast4,
   afSouth1,
   euCentral1,
+  euCentral2,
   euWest1,
   euWest2,
   euWest3,
   euSouth1,
+  euSouth2,
   euNorth1,
   meSouth1,
+  meCentral1,
   saEast1,
   usGovEast1,
   usGovWest1,
@@ -64,19 +76,25 @@ export default [
   caCentral1,
   apEast1,
   apSouth1,
+  apSouth2,
   apNortheast1,
   apNortheast2,
   apNortheast3,
   apSoutheast1,
   apSoutheast2,
+  apSoutheast3,
+  apSoutheast4,
   afSouth1,
   euCentral1,
+  euCentral2,
   euWest1,
   euWest2,
   euWest3,
   euSouth1,
+  euSouth2,
   euNorth1,
   meSouth1,
+  meCentral1,
   saEast1,
   usGovEast1,
   usGovWest1,
diff --git a/src/enums/serviceAliases.ts b/src/enums/serviceAliases.ts
@@ -54,7 +54,7 @@ export default {
   [services.lambda]: 'lambdaFunctions',
   [services.managedAirflow]: 'managedAirflows',
   [services.managedPrefixList]: 'managedPrefixLists',
-  [services.mskCluster]: 'mskCluster',
+  [services.mskCluster]: 'mskClusters',
   [services.nat]: 'natGateway',
   [services.networkInterface]: 'networkInterfaces',
   [services.organization]: 'organizations',
diff --git a/src/services/account/schema.graphql b/src/services/account/schema.graphql
@@ -69,6 +69,7 @@ type awsAccount implements awsOptionalService @key(fields: "id") {
   lambdaFunctions: [awsLambda]
   managedAirflows: [awsManagedAirflow]
   managedPrefixLists: [awsManagedPrefixList]
+  mskClusters: [awsMskCluster]
   nacl: [awsNetworkAcl]
   natGateway: [awsNatGateway]
   networkInterfaces: [awsNetworkInterface]
diff --git a/src/services/apiGatewayResource/format.ts b/src/services/apiGatewayResource/format.ts
@@ -15,7 +15,7 @@ export default ({
   region: string
   account: string
 }): AwsAGResourceType => {
-  const { id, path, resourceMethods = {} } = service
+  const { id, path, restApiId, resourceMethods = {} } = service
 
   const arn = apiGatewayResourceArn({
     restApiArn: apiGatewayArn({ region: service.region }),
@@ -39,5 +39,6 @@ export default ({
     region,
     path,
     methods,
+    restApiId
   }
 }
diff --git a/src/services/apiGatewayResource/schema.graphql b/src/services/apiGatewayResource/schema.graphql
@@ -7,6 +7,7 @@ type awsApiGatewayMethod @key(fields: "arn") {
 }
 
 type awsApiGatewayResource implements awsBaseService @key(fields: "arn") {
+  restApiId: String @search(by: [hash, regexp])
   restApi: [awsApiGatewayRestApi] @hasInverse(field: resources) #change to plural
   path: String @search(by: [hash, regexp])
   methods: [awsApiGatewayMethod]
diff --git a/src/services/apiGatewayStage/format.ts b/src/services/apiGatewayStage/format.ts
@@ -22,6 +22,7 @@ export default ({
     variables: vars = {},
     tags = {},
     region,
+    restApiId
   } = service
 
   const variables = Object.entries(vars).map(([k, v]) => ({
@@ -45,5 +46,6 @@ export default ({
     xrayTracing: tracingEnabled,
     variables,
     tags: formatTagsFromMap(tags),
+    restApiId
   }
 }
diff --git a/src/services/apiGatewayStage/schema.graphql b/src/services/apiGatewayStage/schema.graphql
@@ -29,6 +29,7 @@ type awsApiGatewayStage implements awsBaseService @key(fields: "arn") {
   documentationVersion: String @search(by: [hash, regexp])
   clientCertificateId: String @search(by: [hash])
   xrayTracing: Boolean @search
+  restApiId: String @search(by: [hash, regexp])
   variables: [awsApiGatewayStageVariable]
   tags: [awsRawTag]
   restApi: [awsApiGatewayRestApi] @hasInverse(field: stages)
diff --git a/src/services/msk/connections.ts b/src/services/msk/connections.ts
@@ -1,7 +1,7 @@
 import { ServiceConnection } from '@cloudgraph/sdk'
 
-import services from '../../enums/services'
 import { Cluster } from 'aws-sdk/clients/kafka'
+import services from '../../enums/services'
 
 /**
  * Msk
@@ -22,42 +22,35 @@ export default ({
 }): { [key: string]: ServiceConnection[] } => {
   const connections: ServiceConnection[] = []
 
-  const {
-    ClusterArn: id,
-    Serverless: serverless,
-  } = mskCluster || {}
-  
+  const { ClusterArn: id, Serverless: serverless } = mskCluster || {}
+
   /**
    * Add subnets
    */
-  serverless?.VpcConfigs
-    ?.filter(vc => vc.SubnetIds)
-    ?.forEach(vc => {
-      connections.push(
-        ...vc?.SubnetIds?.map(subnetId => ({
-          id: subnetId,
-          resourceType: services.subnet,
-          relation: 'child',
-          field: 'subnet',
-        }))
-      )
-    })
+  serverless?.VpcConfigs?.filter(vc => vc.SubnetIds)?.forEach(vc => {
+    connections.push(
+      ...vc?.SubnetIds?.map(subnetId => ({
+        id: subnetId,
+        resourceType: services.subnet,
+        relation: 'child',
+        field: 'subnets',
+      }))
+    )
+  })
 
   /**
    * Add Security Groups
    */
-  serverless?.VpcConfigs
-    ?.filter(vc => vc.SecurityGroupIds)
-    ?.forEach(vc => {
-      connections.push(
-        ...vc?.SecurityGroupIds?.map(sgId => ({
-          id: sgId,
-          resourceType: services.sg,
-          relation: 'child',
-          field: 'securityGroups',
-        }))
-      )
-    })
+  serverless?.VpcConfigs?.filter(vc => vc.SecurityGroupIds)?.forEach(vc => {
+    connections.push(
+      ...vc?.SecurityGroupIds?.map(sgId => ({
+        id: sgId,
+        resourceType: services.sg,
+        relation: 'child',
+        field: 'securityGroups',
+      }))
+    )
+  })
 
   const mskResult = {
     [id]: connections,
diff --git a/src/services/msk/schema.graphql b/src/services/msk/schema.graphql
@@ -234,4 +234,6 @@ type awsMskCluster implements awsBaseService @key(fields: "arn") {
   provisioned: awsMskClusterProvisioned
   serverless: awsMskClusterServerless
   tags: [awsRawTag]
+  subnets: [awsSubnet] @hasInverse(field: mskClusters)
+  securityGroups: [awsSecurityGroup] @hasInverse(field: mskClusters)
 }
diff --git a/src/services/route53Record/format.ts b/src/services/route53Record/format.ts
@@ -1,6 +1,16 @@
+import { isEmpty } from 'lodash'
 import { AwsRoute53Record } from '../../types/generated'
-import { RawAwsRoute53Record } from './data'
 import { getHostedZoneId, getRecordId } from '../../utils/ids'
+import { RawAwsRoute53Record } from './data'
+
+// Normalize name due special chars like '*' are replaced with '\\052'
+const normalizeName = (name: string): string => {
+  if (isEmpty(name)) return ''
+  const normalizedName = name.replace(/\\052/g, '*')
+  return normalizedName.endsWith('.')
+    ? normalizedName.slice(0, -1)
+    : normalizedName
+}
 
 /**
  * Route53 Record
@@ -24,8 +34,14 @@ export default ({
     SetIdentifier: identifier = '',
   } = rawData
 
+  const normalizedName = normalizeName(name)
   const hostedZoneId = getHostedZoneId(Id)
-  const id = getRecordId({ hostedZoneId, name, type, identifier })
+  const id = getRecordId({
+    hostedZoneId,
+    name: normalizedName,
+    type,
+    identifier,
+  })
 
   // Resource records
   const resourceRecords = records.map(({ Value }) => Value)
@@ -34,7 +50,7 @@ export default ({
     id,
     accountId: account,
     zoneId: hostedZoneId,
-    name,
+    name: normalizedName,
     setIdentifier: identifier,
     type,
     ttl,
diff --git a/src/services/securityGroup/schema.graphql b/src/services/securityGroup/schema.graphql
@@ -30,6 +30,7 @@ type awsSecurityGroup implements awsBaseService @key(fields: "id") {
   sageMakerNotebookInstances: [awsSageMakerNotebookInstance]
     @hasInverse(field: securityGroups)
   vpcEndpoints: [awsVpcEndpoint] @hasInverse(field: securityGroups)
+  mskClusters: [awsMskCluster] @hasInverse(field: securityGroups)
 }
 
 type awsSgOutboundRule
diff --git a/src/services/subnet/schema.graphql b/src/services/subnet/schema.graphql
@@ -34,4 +34,5 @@ type awsSubnet implements awsBaseService @key(fields: "id") {
     @hasInverse(field: subnet)
   rdsCluster: [awsRdsCluster] @hasInverse(field: subnets)
   vpcEndpoints: [awsVpcEndpoint] @hasInverse(field: subnets)
+  mskClusters: [awsMskCluster] @hasInverse(field: subnets)
 }
diff --git a/src/services/tag/connections.ts b/src/services/tag/connections.ts
@@ -70,6 +70,7 @@ import { RawAwsAnalyzerSummary } from '../iamAccessAnalyzer/data'
 import { RawAwsManagedPrefixList } from '../managedPrefixList/data'
 import { RawAwsTransitGatewayRouteTable } from '../transitGatewayRouteTable/data'
 import { RawAwsVpcPeeringConnection } from '../vpcPeeringConnection/data'
+import { RawAwsMskCluster } from '../msk/data'
 
 const generateTagsMap = (
   data: Array<{ name: string; data: { [property: string]: any[] } }>
@@ -1196,6 +1197,20 @@ function getConnections({
     })
   }
 
+  /**
+   * Find related Msk Clusters
+   */
+   for (const instance of dataForTag[services.mskCluster] || []) {
+    const { ClusterArn: arn }: RawAwsMskCluster = instance
+
+    connections.push({
+      id: arn,
+      resourceType: services.mskCluster,
+      relation: 'child',
+      field: 'mskClusters',
+    })
+  }
+
   const tagResult = {
     [tag.id]: connections,
   }
diff --git a/src/types/generated.ts b/src/types/generated.ts
@@ -202,6 +202,7 @@ export type AwsAccount = AwsOptionalService & {
   lambdaFunctions?: Maybe<Array<Maybe<AwsLambda>>>;
   managedAirflows?: Maybe<Array<Maybe<AwsManagedAirflow>>>;
   managedPrefixLists?: Maybe<Array<Maybe<AwsManagedPrefixList>>>;
+  mskClusters?: Maybe<Array<Maybe<AwsMskCluster>>>;
   nacl?: Maybe<Array<Maybe<AwsNetworkAcl>>>;
   natGateway?: Maybe<Array<Maybe<AwsNatGateway>>>;
   networkInterfaces?: Maybe<Array<Maybe<AwsNetworkInterface>>>;
@@ -390,6 +391,7 @@ export type AwsApiGatewayResource = AwsBaseService & {
   methods?: Maybe<Array<Maybe<AwsApiGatewayMethod>>>;
   path?: Maybe<Scalars['String']>;
   restApi?: Maybe<Array<Maybe<AwsApiGatewayRestApi>>>;
+  restApiId?: Maybe<Scalars['String']>;
 };
 
 export type AwsApiGatewayRestApi = AwsBaseService & {
@@ -417,6 +419,7 @@ export type AwsApiGatewayStage = AwsBaseService & {
   documentationVersion?: Maybe<Scalars['String']>;
   name?: Maybe<Scalars['String']>;
   restApi?: Maybe<Array<Maybe<AwsApiGatewayRestApi>>>;
+  restApiId?: Maybe<Scalars['String']>;
   tags?: Maybe<Array<Maybe<AwsRawTag>>>;
   variables?: Maybe<Array<Maybe<AwsApiGatewayStageVariable>>>;
   webAcl?: Maybe<Array<Maybe<AwsWafV2WebAcl>>>;
@@ -3600,9 +3603,11 @@ export type AwsMskCluster = AwsBaseService & {
   creationTime?: Maybe<Scalars['DateTime']>;
   currentVersion?: Maybe<Scalars['String']>;
   provisioned?: Maybe<AwsMskClusterProvisioned>;
+  securityGroups?: Maybe<Array<Maybe<AwsSecurityGroup>>>;
   serverless?: Maybe<AwsMskClusterServerless>;
   state?: Maybe<Scalars['String']>;
   stateInfo?: Maybe<AwsMskClusterStateInfo>;
+  subnets?: Maybe<Array<Maybe<AwsSubnet>>>;
   tags?: Maybe<Array<Maybe<AwsRawTag>>>;
 };
 
@@ -4234,6 +4239,7 @@ export type AwsSecurityGroup = AwsBaseService & {
   inboundRules?: Maybe<Array<Maybe<AwsSgInboundRule>>>;
   lambda?: Maybe<Array<Maybe<AwsLambda>>>;
   managedAirflows?: Maybe<Array<Maybe<AwsManagedAirflow>>>;
+  mskClusters?: Maybe<Array<Maybe<AwsMskCluster>>>;
   name?: Maybe<Scalars['String']>;
   networkInterfaces?: Maybe<Array<Maybe<AwsNetworkInterface>>>;
   outboundRuleCount?: Maybe<Scalars['Int']>;
@@ -4374,6 +4380,7 @@ export type AwsSubnet = AwsBaseService & {
   ipV6Cidr?: Maybe<Scalars['String']>;
   lambda?: Maybe<Array<Maybe<AwsLambda>>>;
   managedAirflows?: Maybe<Array<Maybe<AwsManagedAirflow>>>;
+  mskClusters?: Maybe<Array<Maybe<AwsMskCluster>>>;
   nacls?: Maybe<Array<Maybe<AwsNetworkAcl>>>;
   natGateway?: Maybe<Array<Maybe<AwsNatGateway>>>;
   networkInterface?: Maybe<Array<Maybe<AwsNetworkInterface>>>;
diff --git a/src/utils/ids.ts b/src/utils/ids.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.87.0-beta.1",`
	`3`	`+ "version": "0.88.0-alpha.2",`
`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
`@@ -15,7 +15,7 @@ export default ({`
`15`	`15`	`region: string`
`16`	`16`	`account: string`
`17`	`17`	`}): AwsAGResourceType => {`
`18`		`- const { id, path, resourceMethods = {} } = service`
	`18`	`+ const { id, path, restApiId, resourceMethods = {} } = service`
`19`	`19`
`20`	`20`	`const arn = apiGatewayResourceArn({`
`21`	`21`	`restApiArn: apiGatewayArn({ region: service.region }),`
`@@ -39,5 +39,6 @@ export default ({`
`39`	`39`	`region,`
`40`	`40`	`path,`
`41`	`41`	`methods,`
	`42`	`+ restApiId`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ type awsApiGatewayMethod @key(fields: "arn") {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`type awsApiGatewayResource implements awsBaseService @key(fields: "arn") {`
	`10`	`+ restApiId: String @search(by: [hash, regexp])`
`10`	`11`	`restApi: [awsApiGatewayRestApi] @hasInverse(field: resources) #change to plural`
`11`	`12`	`path: String @search(by: [hash, regexp])`
`12`	`13`	`methods: [awsApiGatewayMethod]`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ export default ({`
`22`	`22`	`variables: vars = {},`
`23`	`23`	`tags = {},`
`24`	`24`	`region,`
	`25`	`+ restApiId`
`25`	`26`	`} = service`
`26`	`27`
`27`	`28`	`const variables = Object.entries(vars).map(([k, v]) => ({`
`@@ -45,5 +46,6 @@ export default ({`
`45`	`46`	`xrayTracing: tracingEnabled,`
`46`	`47`	`variables,`
`47`	`48`	`tags: formatTagsFromMap(tags),`
	`49`	`+ restApiId`
`48`	`50`	`}`
`49`	`51`	`}`