Merge pull request #35 from cloudgraphdev/fix/CG-1067

fix: Added iamRole connections to emrCluster service

Author: tyler-dunkel

README.md

@@ -2,10 +2,11 @@ import { ServiceConnection } from '@cloudgraph/sdk'
 import { isEmpty } from 'lodash'
 import { RawAwsEmrCluster } from '../emrCluster/data'
 import { RawAwsSubnet } from '../subnet/data'
+import { RawAwsIamRole } from '../iamRole/data'
 import services from '../../enums/services'
+import { globalRegionName } from '../../enums/regions'
 
 export default ({
-  account,
   service,
   data,
   region,
@@ -17,7 +18,13 @@ export default ({
 }): {
   [property: string]: ServiceConnection[]
 } => {
-  const { ClusterArn: id, Ec2InstanceAttributes, LogEncryptionKmsKeyId } = service
+  const {
+    ClusterArn: id,
+    Ec2InstanceAttributes,
+    LogEncryptionKmsKeyId,
+    ServiceRole,
+    AutoScalingRole,
+  } = service
   const connections: ServiceConnection[] = []
   const subnetId = Ec2InstanceAttributes?.Ec2SubnetId
 
@@ -26,8 +33,8 @@ export default ({
    */
   const kmsKeys = data.find(({ name }) => name === services.kms)
   if (kmsKeys?.data?.[region]) {
-    const kmsKeyInRegion = kmsKeys.data[region].filter(kmsKey =>
-      kmsKey.Arn === LogEncryptionKmsKeyId
+    const kmsKeyInRegion = kmsKeys.data[region].filter(
+      kmsKey => kmsKey.Arn === LogEncryptionKmsKeyId
     )
 
     if (!isEmpty(kmsKeyInRegion)) {
@@ -66,8 +73,36 @@ export default ({
     }
   }
 
+  /**
+   * Find IAM Roles
+   */
+  const iamRoles: {
+    name: string
+    data: { [property: string]: any[] }
+  } = data.find(({ name }) => name === services.iamRole)
+
+  if (iamRoles?.data?.[globalRegionName]) {
+    const iamRolesInRegion: RawAwsIamRole[] = iamRoles.data[
+      globalRegionName
+    ].filter(
+      ({ RoleName }: RawAwsIamRole) =>
+        RoleName === ServiceRole || RoleName === AutoScalingRole
+    )
+
+    if (!isEmpty(iamRolesInRegion)) {
+      for (const role of iamRolesInRegion) {
+        connections.push({
+          id: role.Arn,
+          resourceType: services.iamRole,
+          relation: 'child',
+          field: 'iamRoles',
+        })
+      }
+    }
+  }
+
   const result = {
     [id]: connections,
   }
   return result
-}
+}

src/services/emrCluster/connections.ts

@@ -1,15 +1,13 @@
 import cuid from 'cuid'
-import {
-  Configuration,
-} from 'aws-sdk/clients/emr'
+import { Configuration } from 'aws-sdk/clients/emr'
 import { AwsEmrCluster } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 import { RawAwsEmrCluster } from './data'
 
 export default ({
   service,
   account,
-  region
+  region,
 }: {
   service: RawAwsEmrCluster
   account: string
@@ -28,12 +26,10 @@ export default ({
     AutoTerminate: autoTerminate,
     TerminationProtected: terminationProtected,
     VisibleToAllUsers: visibleToAllUsers,
-    ServiceRole: serviceRole,
     NormalizedInstanceHours: normalizedInstanceHours,
     MasterPublicDnsName: masterPublicDnsName,
     Configurations: configurations,
     SecurityConfiguration: securityConfiguration,
-    AutoScalingRole: autoScalingRole,
     ScaleDownBehavior: scaleDownBehavior,
     CustomAmiId: customAmiId,
     EbsRootVolumeSize: ebsRootVolumeSize,
@@ -50,7 +46,7 @@ export default ({
     Timeline: timeline,
   } = status ?? {}
 
-  const { 
+  const {
     Ec2KeyName: ec2KeyName,
     Ec2SubnetId: ec2SubnetId,
     RequestedEc2SubnetIds: requestedEc2SubnetIds,
@@ -73,7 +69,7 @@ export default ({
       id: cuid(),
       key,
       value: app.AdditionalInfo[key],
-    }))
+    })),
   }))
 
   const {
@@ -92,7 +88,7 @@ export default ({
       id: cuid(),
       key,
       value: config.Properties[key],
-    }))
+    })),
   })
 
   const placementGroups = service.PlacementGroups?.map(pg => ({
@@ -116,7 +112,7 @@ export default ({
         creationDateTime: timeline?.CreationDateTime?.toISOString(),
         readyDateTime: timeline?.ReadyDateTime?.toISOString(),
         endDateTime: timeline?.EndDateTime?.toISOString(),
-      }
+      },
     },
     ec2InstanceAttributes: {
       ec2KeyName,
@@ -141,12 +137,10 @@ export default ({
     terminationProtected,
     visibleToAllUsers,
     applications,
-    serviceRole,
     normalizedInstanceHours,
     masterPublicDnsName,
     configurations: configurations?.map(child => configConverter(child)),
     securityConfiguration,
-    autoScalingRole,
     scaleDownBehavior,
     customAmiId,
     ebsRootVolumeSize,
@@ -163,4 +157,4 @@ export default ({
     placementGroups,
     tags: formatTagsFromMap(Tags),
   }
-}
+}

src/services/emrCluster/format.ts

@@ -1,4 +1,3 @@
-#TODO: add iamRole connection here
 type awsEmrCluster implements awsBaseService @key(fields: "arn") {
   status: AwsEmrClusterStatus
   ec2InstanceAttributes: AwsEmrClusterEc2InstanceAttributes
@@ -12,12 +11,10 @@ type awsEmrCluster implements awsBaseService @key(fields: "arn") {
   terminationProtected: Boolean @search
   visibleToAllUsers: Boolean @search
   applications: [AwsEmrClusterApplication]
-  serviceRole: String @search(by: [hash, regexp])
   normalizedInstanceHours: Int @search
   masterPublicDnsName: String @search(by: [hash, regexp])
   configurations: [AwsEmrClusterConfiguration]
   securityConfiguration: String @search(by: [hash, regexp])
-  autoScalingRole: String @search(by: [hash, regexp])
   scaleDownBehavior: String @search(by: [hash, regexp])
   customAmiId: String @search(by: [hash, regexp])
   ebsRootVolumeSize: Int @search
@@ -29,6 +26,7 @@ type awsEmrCluster implements awsBaseService @key(fields: "arn") {
   tags: [awsRawTag]
   kms: [awsKms] @hasInverse(field: emrCluster)
   subnet: [awsSubnet] @hasInverse(field: emrCluster) #change to plural
+  iamRoles: [awsIamRole] @hasInverse(field: emrCluster)
 }
 
 type AwsEmrClusterApplication

src/services/emrCluster/schema.graphql

@@ -37,4 +37,5 @@ type awsIamRole implements awsBaseService @key(fields: "id") {
   asg: [awsAsg] @hasInverse(field: iamRole)
   awsCognitoIdentityPool: [awsCognitoIdentityPool] @hasInverse(field: iamRoles)
   rdsDbInstance: [awsRdsDbInstance] @hasInverse(field: iamRoles)
+  emrCluster: [awsEmrCluster] @hasInverse(field: iamRoles)
 }

src/services/iamRole/schema.graphql

@@ -2742,12 +2742,12 @@ export type AwsElbSourceSecurityGroup = {
 
 export type AwsEmrCluster = AwsBaseService & {
   applications?: Maybe<Array<Maybe<AwsEmrClusterApplication>>>;
-  autoScalingRole?: Maybe<Scalars['String']>;
   autoTerminate?: Maybe<Scalars['Boolean']>;
   configurations?: Maybe<Array<Maybe<AwsEmrClusterConfiguration>>>;
   customAmiId?: Maybe<Scalars['String']>;
   ebsRootVolumeSize?: Maybe<Scalars['Int']>;
   ec2InstanceAttributes?: Maybe<AwsEmrClusterEc2InstanceAttributes>;
+  iamRoles?: Maybe<Array<Maybe<AwsIamRole>>>;
   instanceCollectionType?: Maybe<Scalars['String']>;
   kerberosAttributes?: Maybe<AwsEmrClusterKerberosAttributes>;
   kms?: Maybe<Array<Maybe<AwsKms>>>;
@@ -2763,7 +2763,6 @@ export type AwsEmrCluster = AwsBaseService & {
   runningAmiVersion?: Maybe<Scalars['String']>;
   scaleDownBehavior?: Maybe<Scalars['String']>;
   securityConfiguration?: Maybe<Scalars['String']>;
-  serviceRole?: Maybe<Scalars['String']>;
   status?: Maybe<AwsEmrClusterStatus>;
   stepConcurrencyLevel?: Maybe<Scalars['Int']>;
   subnet?: Maybe<Array<Maybe<AwsSubnet>>>;
@@ -3082,6 +3081,7 @@ export type AwsIamRole = AwsBaseService & {
   eksClusters?: Maybe<Array<Maybe<AwsEksCluster>>>;
   elasticBeanstalkApps?: Maybe<Array<Maybe<AwsElasticBeanstalkApp>>>;
   elasticBeanstalkEnvs?: Maybe<Array<Maybe<AwsElasticBeanstalkEnv>>>;
+  emrCluster?: Maybe<Array<Maybe<AwsEmrCluster>>>;
   flowLogs?: Maybe<Array<Maybe<AwsFlowLog>>>;
   glueJobs?: Maybe<Array<Maybe<AwsGlueJob>>>;
   guardDutyDetectors?: Maybe<Array<Maybe<AwsGuardDutyDetector>>>;