fix: Fixed glueJob and glueRegistry issues during scan

Author: Marco Franceschi

src/services/glueJob/data.ts

@@ -1,6 +1,6 @@
 import { Config } from 'aws-sdk/lib/config'
 import GLUE from 'aws-sdk/clients/glue'
-import { groupBy } from 'lodash'
+import { groupBy, isEmpty } from 'lodash'
 import { convertToPromise, fetchAllPaginatedData } from '../../utils/fetchUtils'
 import { initTestEndpoint } from '../../utils'
 import ErrorLog from '../../utils/errorLog'
@@ -23,29 +23,31 @@ export default async ({
 }: {
   regions: string
   config: Config
-}): Promise<{ [region: string]: RawAwsGlueJob[]}> => {
+}): Promise<{ [region: string]: RawAwsGlueJob[] }> => {
   const result: RawAwsGlueJob[] = []
 
   const activeRegions = regions.split(',')
 
   for (const region of activeRegions) {
-    let glueJobData: GLUE.Job[]
+    let glueJobData: GLUE.Job[] = []
     try {
-      glueJobData = await fetchAllPaginatedData({
-        getResourcesFn: convertToPromise({
-          sdkContext: new GLUE({ ...config, region, endpoint }),
-          fnName: 'getJobs',
-        }),
-        accessor: '',
-      }) ?? []
+      glueJobData =
+        (await fetchAllPaginatedData({
+          getResourcesFn: convertToPromise({
+            sdkContext: new GLUE({ ...config, region, endpoint }),
+            fnName: 'getJobs',
+          }),
+          accessor: '',
+        })) ?? []
     } catch (err) {
       errorLog.generateAwsErrorLog({
         functionName: 'glueJob:getJobs',
-        err
+        err,
       })
     }
 
-    result.push(...glueJobData.map(val => ({ ...val, region })))
+    if (!isEmpty(glueJobData))
+      result.push(...glueJobData.map(val => ({ ...val, region })))
   }
   errorLog.reset()
   return groupBy(result, 'region')

src/services/glueRegistry/data.ts

@@ -31,7 +31,7 @@ export default async ({
   const activeRegions = regions.split(',')
 
   for (const region of activeRegions) {
-    let glueRegistryData: GLUE.RegistryListItem[]
+    let glueRegistryData: GLUE.RegistryListItem[] = []
     try {
       glueRegistryData = await fetchAllPaginatedData({
         getResourcesFn: convertToPromise({