fix: fixed services that returned only the first page of paged results

Author: m-pizarro

src/services/apiGatewayResource/data.ts

@@ -66,9 +66,9 @@ const getResources = async ({ apiGw, restApiId }): Promise<ListOfResource> =>
 
             if (position) {
               listAllResources(position)
+            } else {
+              resolve(resourceList)
             }
-
-            resolve(resourceList)
           }
         )
       } catch (error) {

src/services/apiGatewayRestApi/data.ts

@@ -64,9 +64,9 @@ export const getRestApisForRegion = async (
 
           if (position) {
             listAllRestApis(position)
+          } else {
+            resolve(restApiList)
           }
-
-          resolve(restApiList)
         })
       } catch (error) {
         resolve([])

src/services/cloud9/data.ts

@@ -28,11 +28,17 @@ const errorLog = new AwsErrorLog(serviceName)
 const endpoint = initTestEndpoint(serviceName)
 const MAX_ITEMS = 25
 
-const listEnvironmentsForRegion = async ({ cloud9, resolveRegion }) =>
+const listEnvironmentsForRegion = async ({ 
+  cloud9, 
+  resolveRegion,
+}: {
+  cloud9: Cloud9
+  resolveRegion: () => void
+}): Promise<EnvironmentId[]> =>
   new Promise<EnvironmentId[]>(resolve => {
     const environmentIdList: EnvironmentIdList = []
     const listEnvironmentsOpts: ListEnvironmentsRequest = {}
-    const listAllEnvironments = (token?: string) => {
+    const listAllEnvironments = (token?: string): void => {
       if (token) {
         listEnvironmentsOpts.nextToken = token
       }
@@ -61,9 +67,9 @@ const listEnvironmentsForRegion = async ({ cloud9, resolveRegion }) =>
                 lt.foundMoreCloud9Environments(environmentIds.length)
               )
               listAllEnvironments(nextToken)
+            } else {
+              resolve(environmentIdList)
             }
-
-            resolve(environmentIdList)
           }
         )
       } catch (error) {

src/services/cloudFormationStack/data.ts

@@ -42,24 +42,28 @@ const getAllStacks = async (cf: CloudFormation): Promise<Stack[]> =>
         opts.NextToken = token
       }
 
-      cf.describeStacks(opts, (err: AWSError, data: DescribeStacksOutput) => {
-        const { Stacks = [], NextToken } = data || {}
-
-        if (err) {
-          errorLog.generateAwsErrorLog({
-            functionName: 'CloudFormationStack:describeStacks',
-            err,
-          })
-        }
+      try {
+        cf.describeStacks(opts, (err: AWSError, data: DescribeStacksOutput) => {
+          const { Stacks = [], NextToken } = data || {}
 
-        fullStacks.push(...Stacks)
+          if (err) {
+            errorLog.generateAwsErrorLog({
+              functionName: 'CloudFormationStack:describeStacks',
+              err,
+            })
+          }
 
-        if (NextToken) {
-          listAllStacks(NextToken)
-        }
+          fullStacks.push(...Stacks)
 
-        resolve(fullStacks)
-      })
+          if (NextToken) {
+            listAllStacks(NextToken)
+          } else {
+            resolve(fullStacks)
+          }
+        })
+      } catch (error) {
+        resolve([])
+      }
     }
     listAllStacks()
   })

src/services/cloudfront/data.ts

@@ -75,9 +75,9 @@ const listCloudfrontDistributions = async (
 
           if (IsTruncated) {
             listDistributions(nextToken)
+          } else {
+            resolve(distributions)
           }
-
-          resolve(distributions)
         }
       )
     }

src/services/cloudwatch/data.ts

@@ -76,9 +76,9 @@ const listMetricAlarmsForRegion = async ({
             if (nextToken) {
               logger.debug(lt.foundMoreCloudwatchAlarms(metricAlarms.length))
               listAllAlarms(nextToken)
+            } else {
+              resolve(metricAlarmsList)
             }
-
-            resolve(metricAlarmsList)
           }
         )
       } catch (error) {
@@ -88,7 +88,10 @@ const listMetricAlarmsForRegion = async ({
     listAllAlarms()
   })
 
-const getResourceTags = async (cloudwatch: CloudWatch, arn: string) =>
+const getResourceTags = async (
+  cloudwatch: CloudWatch,
+  arn: string
+): Promise<TagMap> =>
   new Promise<TagMap>(resolve => {
     try {
       cloudwatch.listTagsForResource(

src/services/cloudwatchLogs/data.ts

@@ -76,7 +76,9 @@ const listLogGroupsForRegion = async ({
               region,
             }))
 
-            resolve(logGroupsData)
+            if (!nextToken) {
+              resolve(logGroupsData)
+            }
           }
         )
       } catch (error) {

src/services/ebs/data.ts

@@ -123,10 +123,13 @@ const listEbsVolumes = async ({
       const ebsVolumes = []
 
       for (const { Tags, SnapshotId, ...volume } of volumes) {
-        const snapshotAttributes = await listEbsSnapshotAttribute({
-          ec2,
-          snapshotId: SnapshotId,
-        })
+        let snapshotAttributes: CreateVolumePermission[] = []
+        if (SnapshotId) {
+          snapshotAttributes = await listEbsSnapshotAttribute({
+            ec2,
+            snapshotId: SnapshotId,
+          })
+        }
         ebsVolumes.push({
           ...volume,
           region,

src/services/ecr/data.ts

@@ -64,10 +64,10 @@ const listReposForRegion = async ({
             if (nextToken) {
               logger.debug(lt.foundMoreECRRepos(repositories.length))
               listAllRepos(nextToken)
+            } else {
+              logger.debug(lt.fetchedECRRepos(repositoryList.length))
+              resolve(repositoryList)
             }
-
-            logger.debug(lt.fetchedECRRepos(repositoryList.length))
-            resolve(repositoryList)
           }
         )
       } catch (error) {

src/services/eksCluster/data.ts

@@ -23,11 +23,17 @@ const errorLog = new AwsErrorLog(serviceName)
 const endpoint = initTestEndpoint(serviceName)
 const MAX_ITEMS = 100
 
-const listClustersForRegion = async ({ eks, resolveRegion }) =>
+const listClustersForRegion = async ({ 
+  eks, 
+  resolveRegion,
+}: {
+  eks: EKS
+  resolveRegion: () => void
+}): Promise<string[]> =>
   new Promise<string[]>(resolve => {
     const clusterList: string[] = []
     const listClustersOpts: ListClustersRequest = {}
-    const listAllClusters = (token?: string) => {
+    const listAllClusters = (token?: string): void => {
       listClustersOpts.maxResults = MAX_ITEMS
       if (token) {
         listClustersOpts.nextToken = token
@@ -55,9 +61,10 @@ const listClustersForRegion = async ({ eks, resolveRegion }) =>
             if (nextToken) {
               logger.debug(lt.foundMoreEKSClusters(clusters.length))
               listAllClusters(nextToken)
+            } else {
+              resolve(clusterList)
             }
 
-            resolve(clusterList)
           }
         )
       } catch (error) {