Merge branch 'alpha' into feature/CG-1192

Author: m-pizarro

CHANGELOG.md

@@ -1,3 +1,26 @@
+# [0.81.0-alpha.4](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.81.0-alpha.3...0.81.0-alpha.4) (2022-05-12)
+
+
+### Bug Fixes
+
+* Added missing return to resolve promise ([904b25d](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/904b25dc52e019b0bcf7da6f8051a63f3a7e8a56))
+* Added SSLCertificateId needed for the NIST 16.5 rule ([def7137](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/def7137e0d0e4e1c4afdc6345fc0b4a3640fc22d))
+
+# [0.81.0-alpha.3](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.81.0-alpha.2...0.81.0-alpha.3) (2022-05-11)
+
+
+### Bug Fixes
+
+* Added validations and retry settings ([200c7f2](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/200c7f238c1b4f5142770e357ea4fc4a1e16d155))
+* Added validations and retry settings ([fec06cb](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/fec06cb6d869099797a017b582dcbbfbac17c60d))
+
+# [0.81.0-alpha.2](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.81.0-alpha.1...0.81.0-alpha.2) (2022-05-10)
+
+
+### Bug Fixes
+
+* fixed services that returned only the first page of paged results ([fcbd78b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/fcbd78bbbabefca9e7e4c37ec9b28618601a2e3d))
+
 # [0.81.0-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.80.0...0.81.0-alpha.1) (2022-05-04)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.81.0-alpha.1",
+  "version": "0.81.0-alpha.4",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

src/config/constants.ts

@@ -8,3 +8,4 @@ export const ROUTE_53_CUSTOM_DELAY = 200
 export const IAM_CUSTOM_DELAY = 1000
 export const CLOUDFORMATION_STACK_CUSTOM_DELAY = 1000
 export const MESSAGE_INTERVAL = 45000
+export const SNS_CUSTOM_DELAY = 1000

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

@@ -65,9 +65,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

@@ -68,16 +68,16 @@ const listCloudfrontDistributions = async (
            * No Distributions Found
            */
           if (isEmpty(Items)) {
-            resolve([])
+            return resolve([])
           }
 
           distributions.push(...Items)
 
           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) {