Merge pull request #132 from cloudgraphdev/feature/EP-3149-updates-needed-for-terraform

feat(aws): Added some adjustment needed for TF

Author: tyler-dunkel

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',

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]

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
   }
 }

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]

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
   }
 }

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)

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,

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)
 }

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,

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