fix(aws): fixes for beta release review

m-pizarro · m-pizarro · commit d6dc132b1945 · 2023-06-07T14:00:50.000-03:00
diff --git a/src/services/docdbCluster/data.ts b/src/services/docdbCluster/data.ts
@@ -1,21 +1,19 @@
 import CloudGraph from '@cloudgraph/sdk'
 import DOCDB, {
   DBCluster,
-  TagListMessage,
-  DescribeDBClustersMessage,
   DBClusterMessage,
   DBSubnetGroup,
   DBSubnetGroupMessage,
+  DescribeDBClustersMessage,
 } from 'aws-sdk/clients/docdb'
+import { Config } from 'aws-sdk/lib/config'
 import { AWSError } from 'aws-sdk/lib/error'
 import groupBy from 'lodash/groupBy'
 import isEmpty from 'lodash/isEmpty'
-import { Config } from 'aws-sdk/lib/config'
 import awsLoggerText from '../../properties/logger'
-import { TagMap, AwsTag } from '../../types'
-import { convertAwsTagsToTagMap } from '../../utils/format'
-import AwsErrorLog from '../../utils/errorLog'
+import { TagMap } from '../../types'
 import { initTestEndpoint } from '../../utils'
+import AwsErrorLog from '../../utils/errorLog'
 
 const lt = { ...awsLoggerText }
 const { logger } = CloudGraph
@@ -75,9 +73,14 @@ const describeDBSubnetGroups = async (
             })
             return resolve([])
           }
-          if (!isEmpty(data)) {
-            resolve(data.DBSubnetGroups)
+          if (isEmpty(data)) {
+            return resolve([])
+          }
+          const { DBSubnetGroups = [] } = data || {}
+          if (isEmpty(DBSubnetGroups)) {
+            return resolve([])
           }
+          resolve(DBSubnetGroups)
         }
       )
     } catch (error) {
diff --git a/src/services/eksCluster/data.ts b/src/services/eksCluster/data.ts
@@ -66,7 +66,6 @@ const listClustersForRegion = async ({
             } else {
               resolve(clusterList)
             }
-
           }
         )
       } catch (error) {
@@ -164,9 +163,9 @@ const listNodegroups = async ({
 
             if (nextToken) {
               listAllNodeGroups(nextToken)
+            } else {
+              resolve(nodeGroupsList)
             }
-
-            resolve(nodeGroupsList)
           }
         )
       } catch (error) {
diff --git a/src/services/elasticBeanstalkApplication/data.ts b/src/services/elasticBeanstalkApplication/data.ts
@@ -6,6 +6,7 @@ import {
 import CloudGraph from '@cloudgraph/sdk'
 import { Config } from 'aws-sdk'
 import { ApplicationDescription } from 'aws-sdk/clients/elasticbeanstalk'
+import { groupBy } from 'lodash'
 import isEmpty from 'lodash/isEmpty'
 import awsLoggerText from '../../properties/logger'
 import { AwsTag, TagMap } from '../../types'
@@ -19,6 +20,7 @@ const serviceName = 'ElasticBeanstalkApp'
 const errorLog = new AwsErrorLog(serviceName)
 
 export interface RawAwsElasticBeanstalkApp extends ApplicationDescription {
+  region: string
   Tags?: TagMap
 }
 
@@ -64,12 +66,13 @@ export const getResourceTags = async (
         }
         resolveTags(convertAwsTagsToTagMap(tags as AwsTag[]))
       })
-      .catch(err =>
+      .catch(err => {
         errorLog.generateAwsErrorLog({
           functionName: 'elasticBeanstalk:listTagsForResource',
           err,
         })
-      )
+        resolveTags({})
+      })
   })
 
 const getApplications = async (
@@ -97,25 +100,25 @@ export default async ({
   new Promise(async resolve => {
     const { credentials } = config
     let numberOfApps = 0
-    const output: { [property: string]: RawAwsElasticBeanstalkApp[] } = {}
+    const appsData: RawAwsElasticBeanstalkApp[] = []
 
-    // First we get all applications for all regions
-    await Promise.all(
-      regions.split(',').map(region => {
-        const eb = new ElasticBeanstalkClient({
-          credentials,
-          region,
-        })
-        output[region] = []
-        return new Promise<void>(async resolveRegion => {
-          const apps = (await getApplications(eb)) || []
-          output[region] = apps
+    const regionPromises = regions.split(',').map(region => {
+      const eb = new ElasticBeanstalkClient({
+        credentials,
+        region,
+      })
+      return new Promise<void>(async resolveRegion => {
+        const apps = (await getApplications(eb)) || []
+        if (!isEmpty(apps)) {
+          appsData.push(...apps.map(val => ({ ...val, region })))
           numberOfApps += apps.length
-          resolveRegion()
-        })
+        }
+        resolveRegion()
       })
-    )
+    })
+
+    await Promise.all(regionPromises)
     errorLog.reset()
     logger.debug(lt.fetchedElasticBeanstalkApps(numberOfApps))
-    resolve(output)
+    resolve(groupBy(appsData, 'region'))
   })
diff --git a/src/services/elasticBeanstalkEnvironment/data.ts b/src/services/elasticBeanstalkEnvironment/data.ts
@@ -14,6 +14,7 @@ import {
   EnvironmentDescription,
   EnvironmentResourceDescription,
 } from 'aws-sdk/clients/elasticbeanstalk'
+import { groupBy } from 'lodash'
 import isEmpty from 'lodash/isEmpty'
 import awsLoggerText from '../../properties/logger'
 import { TagMap } from '../../types'
@@ -31,6 +32,7 @@ export interface RawAwsElasticBeanstalkEnv extends EnvironmentDescription {
   resources?: EnvironmentResourceDescription
   settings?: ConfigurationSettingsDescription[]
   Tags?: TagMap
+  region: string
 }
 
 const listEnvironments = async (
@@ -175,27 +177,25 @@ export default async ({
   new Promise(async resolve => {
     const { credentials } = config
     let numberOfEnvs = 0
-    const output: {
-      [property: string]: RawAwsElasticBeanstalkEnv[]
-    } = {}
-
-    // First we get all applications for all regions
-    await Promise.all(
-      regions.split(',').map(region => {
-        const eb = new ElasticBeanstalkClient({
-          credentials,
-          region,
-        })
-        output[region] = []
-        return new Promise<void>(async resolveRegion => {
-          const envs = (await getEnvironments(eb)) || []
-          output[region] = envs
+    const envsData: RawAwsElasticBeanstalkEnv[] = []
+
+    const regionPromises = regions.split(',').map(region => {
+      const eb = new ElasticBeanstalkClient({
+        credentials,
+        region,
+      })
+      return new Promise<void>(async resolveRegion => {
+        const envs = (await getEnvironments(eb)) || []
+        if (!isEmpty(envs)) {
+          envsData.push(...envs.map(val => ({ ...val, region })))
           numberOfEnvs += envs.length
-          resolveRegion()
-        })
+        }
+        resolveRegion()
       })
-    )
+    })
+
+    await Promise.all(regionPromises)
     errorLog.reset()
     logger.debug(lt.fetchedElasticBeanstalkEnvs(numberOfEnvs))
-    resolve(output)
+    resolve(groupBy(envsData, 'region'))
   })
diff --git a/src/services/sesDomain/data.ts b/src/services/sesDomain/data.ts
@@ -20,7 +20,6 @@ const serviceName = 'SES Domain'
 const errorLog = new AwsErrorLog(serviceName)
 const endpoint = initTestEndpoint(serviceName)
 
-
 /**
  * SES Domains
  */
@@ -48,20 +47,20 @@ export default async ({
         ses.listIdentities(
           { IdentityType: 'Domain' },
           (err: AWSError, data: ListIdentitiesResponse) => {
-            /**
-             * No Data for the region
-             */
-            if (isEmpty(data)) {
-              return resolveRegion()
-            }
-
             if (err) {
               errorLog.generateAwsErrorLog({
                 functionName: 'sesDomain:listIdentities',
                 err,
               })
             }
 
+            /**
+             * No Data for the region
+             */
+            if (isEmpty(data)) {
+              return resolveRegion()
+            }
+
             const { Identities }: { Identities: string[] } = data
 
             /**
@@ -87,15 +86,15 @@ export default async ({
                   ) => {
                     if (err) {
                       errorLog.generateAwsErrorLog({
-                        functionName: 'sesDomain:getIdentityVerificationAttributes',
+                        functionName:
+                          'sesDomain:getIdentityVerificationAttributes',
                         err,
                       })
                     }
 
                     if (!isEmpty(identities)) {
                       sesData.push(
                         ...Identities.map(Identity => ({
-
                           Identity,
                           ...identities[Identity],
                           region,
diff --git a/src/services/sesEmail/data.ts b/src/services/sesEmail/data.ts
@@ -47,20 +47,20 @@ export default async ({
         ses.listIdentities(
           { IdentityType: 'EmailAddress' },
           (err: AWSError, data: ListIdentitiesResponse) => {
-            /**
-             * No Data for the region
-             */
-            if (isEmpty(data)) {
-              return resolveRegion()
-            }
-
             if (err) {
               errorLog.generateAwsErrorLog({
                 functionName: 'sesEmail:listIdentities',
                 err,
               })
             }
 
+            /**
+             * No Data for the region
+             */
+            if (isEmpty(data)) {
+              return resolveRegion()
+            }
+
             const { Identities }: { Identities: string[] } = data
 
             /**
@@ -86,15 +86,15 @@ export default async ({
                   ) => {
                     if (err) {
                       errorLog.generateAwsErrorLog({
-                        functionName: 'sesEmail:getIdentityVerificationAttributes',
+                        functionName:
+                          'sesEmail:getIdentityVerificationAttributes',
                         err,
                       })
                     }
 
                     if (!isEmpty(identities)) {
                       sesData.push(
                         ...Identities.map(Identity => ({
-
                           Identity,
                           ...identities[Identity],
                           region,
diff --git a/src/services/systemsManagerParameter/data.ts b/src/services/systemsManagerParameter/data.ts
@@ -6,6 +6,7 @@ import {
 } from '@aws-sdk/client-ssm'
 import CloudGraph from '@cloudgraph/sdk'
 import { Config } from 'aws-sdk'
+import { groupBy } from 'lodash'
 import isEmpty from 'lodash/isEmpty'
 import awsLoggerText from '../../properties/logger'
 import AwsErrorLog from '../../utils/errorLog'
@@ -16,6 +17,10 @@ const serviceName = 'SystemsManagerParameter'
 const errorLog = new AwsErrorLog(serviceName)
 const MAX_ITEMS = 50
 
+export interface RawAwsParameterMetadata extends ParameterMetadata {
+  region: string
+}
+
 const listParameters = async (ssm: SSMClient): Promise<ParameterMetadata[]> =>
   new Promise(async resolve => {
     const parameters: ParameterMetadata[] = []
@@ -64,26 +69,24 @@ export default async ({
 }: {
   regions: string
   config: Config
-}): Promise<{ [property: string]: ParameterMetadata[] }> =>
+}): Promise<{ [property: string]: RawAwsParameterMetadata[] }> =>
   new Promise(async resolve => {
     const { credentials } = config
-    const output: { [property: string]: ParameterMetadata[] } = {}
+    const paramsData: RawAwsParameterMetadata[] = []
 
-    await Promise.all(
-      regions.split(',').map(region => {
-        const ssm = new SSMClient({
-          credentials,
-          region,
-        })
-        output[region] = []
-        return new Promise<void>(async resolveRegion => {
-          const params = (await listParameters(ssm)) || []
-          output[region] = params
-          resolveRegion()
-        })
+    const regionPromises = regions.split(',').map(async region => {
+      const ssm = new SSMClient({
+        credentials,
+        region,
       })
-    )
+      const params = (await listParameters(ssm)) || []
+      if (!isEmpty(params)) {
+        paramsData.push(...params.map(val => ({ ...val, region })))
+      }
+    })
+
+    await Promise.all(regionPromises)
     errorLog.reset()
 
-    resolve(output)
+    resolve(groupBy(paramsData, 'region'))
   })
diff --git a/src/services/systemsManagerParameter/format.ts b/src/services/systemsManagerParameter/format.ts
@@ -1,6 +1,6 @@
-import { ParameterMetadata } from '@aws-sdk/client-ssm'
 import { AwsSystemsManagerParameter } from '../../types/generated'
 import { ssmParameterArn } from '../../utils/generateArns'
+import { RawAwsParameterMetadata } from './data'
 
 /**
  * Systems Manager Parameter
@@ -12,7 +12,7 @@ export default ({
 }: {
   account: string
   region: string
-  service: ParameterMetadata
+  service: RawAwsParameterMetadata
 }): AwsSystemsManagerParameter => {
   const { Name: name } = parameter
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ const listClustersForRegion = async ({`
`66`	`66`	`} else {`
`67`	`67`	`resolve(clusterList)`
`68`	`68`	`}`
`69`		`-`
`70`	`69`	`}`
`71`	`70`	`)`
`72`	`71`	`} catch (error) {`
`@@ -164,9 +163,9 @@ const listNodegroups = async ({`
`164`	`163`
`165`	`164`	`if (nextToken) {`
`166`	`165`	`listAllNodeGroups(nextToken)`
	`166`	`+ } else {`
	`167`	`+ resolve(nodeGroupsList)`
`167`	`168`	`}`
`168`		`-`
`169`		`- resolve(nodeGroupsList)`
`170`	`169`	`}`
`171`	`170`	`)`
`172`	`171`	`} catch (error) {`