Merge pull request #92 from cloudgraphdev/fix/iam-role-name

fix: Optional chaining for last used details

Author: mfranceschit

src/services/iamRole/data.ts

@@ -5,7 +5,8 @@ import isEmpty from 'lodash/isEmpty'
 import { AWSError } from 'aws-sdk/lib/error'
 
 import IAM, {
-  AttachedPolicy, GetRoleResponse,
+  AttachedPolicy,
+  GetRoleResponse,
   ListAttachedRolePoliciesResponse,
   ListRolePoliciesResponse,
   ListRolesResponse,
@@ -44,33 +45,30 @@ export interface RawAwsIamRole extends Omit<Role, 'Tags'> {
 }
 
 const roleByRoleName = async (
-    iam: IAM,
-    { RoleName }: Role
-): Promise<{RoleName: string; Role: Role}> =>
-    new Promise(resolve => {
-        iam.getRole(
-            { RoleName },
-            (err: AWSError, data: GetRoleResponse) => {
-                if (err) {
-                    errorLog.generateAwsErrorLog({
-                        err,
-                        functionName: 'iam:getRole',
-                    })
-                }
+  iam: IAM,
+  { RoleName }: Role
+): Promise<{ RoleName: string; Role: Role }> =>
+  new Promise(resolve => {
+    iam.getRole({ RoleName }, (err: AWSError, data: GetRoleResponse) => {
+      if (err) {
+        errorLog.generateAwsErrorLog({
+          err,
+          functionName: 'iam:getRole',
+        })
+      }
 
-                if (!isEmpty(data)) {
-                    const {Role} = data
+      if (!isEmpty(data)) {
+        const { Role } = data
 
-                    resolve({
-                        RoleName,
-                        Role,
-                    })
-                }
+        resolve({
+          RoleName,
+          Role,
+        })
+      }
 
-                resolve(null)
-            }
-        )
+      resolve(null)
     })
+  })
 
 const tagsByRoleName = async (
   iam: IAM,
@@ -165,7 +163,8 @@ export const listIamRoles = async (
     const policiesByRoleNamePromises = []
     const tagsByRoleNamePromises = []
     const managedPoliciesByRoleNamePromises = []
-    const roleByRoleNamePromises: Promise<{RoleName: string; Role: Role}>[] = []
+    const roleByRoleNamePromises: Promise<{ RoleName: string; Role: Role }>[] =
+      []
 
     iam.listRoles(
       { Marker: marker },
@@ -205,7 +204,9 @@ export const listIamRoles = async (
                   ),
                   ...role,
                   region: globalRegionName,
-                  RoleLastUsed: detailedRoles?.find(r => r.RoleName === RoleName)?.Role.RoleLastUsed,
+                  RoleLastUsed: detailedRoles?.find(
+                    r => r?.RoleName === RoleName
+                  )?.Role.RoleLastUsed,
                   Policies:
                     policies
                       ?.filter(p => p?.RoleName === RoleName)