fix: Added validations and retry settings

Author: m-pizarro

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/sns/data.ts

@@ -19,13 +19,21 @@ import awsLoggerText from '../../properties/logger'
 import { AwsTag, TagMap } from '../../types'
 import { convertAwsTagsToTagMap } from '../../utils/format'
 import AwsErrorLog from '../../utils/errorLog'
-import { initTestEndpoint } from '../../utils'
+import { initTestEndpoint, setAwsRetryOptions } from '../../utils'
+import {
+  API_GATEWAY_CUSTOM_DELAY,
+  MAX_FAILED_AWS_REQUEST_RETRIES,
+} from '../../config/constants'
 
 const lt = { ...awsLoggerText }
 const { logger } = CloudGraph
 const serviceName = 'SNS'
 const errorLog = new AwsErrorLog(serviceName)
 const endpoint = initTestEndpoint(serviceName)
+const customRetrySettings = setAwsRetryOptions({
+  maxRetries: MAX_FAILED_AWS_REQUEST_RETRIES,
+  baseDelay: API_GATEWAY_CUSTOM_DELAY,
+})
 
 /**
  * SNS
@@ -155,14 +163,19 @@ const getTopicSubscriptions = async (
         sns.listSubscriptionsByTopic(
           listSubscriptionsOpts,
           (err: AWSError, data: ListSubscriptionsByTopicResponse) => {
-            const { Subscriptions, NextToken } = data || {}
             if (err) {
               errorLog.generateAwsErrorLog({
                 functionName: 'sns:listSubscriptionsByTopic',
                 err,
               })
             }
 
+            if (isEmpty(data)) {
+              resolveSubscriptions([])
+            }
+
+            const { Subscriptions, NextToken } = data || {}
+
             subscriptions.push(...Subscriptions)
 
             if (NextToken) {
@@ -196,7 +209,12 @@ export default async ({
 
     // First we get all sns topics arn for all regions
     regions.split(',').map(region => {
-      const sns = new SNS({ ...config, region, endpoint })
+      const sns = new SNS({
+        ...config,
+        region,
+        endpoint,
+        ...customRetrySettings,
+      })
       const regionPromise = new Promise<void>(async resolveRegion => {
         const snsTopicArnList = await listSnsTopicArnsForRegion({
           sns,

src/services/sns/format.ts

@@ -32,7 +32,7 @@ export default ({
     Policy: policy,
     DisplayName: displayName,
     DeliveryPolicy: deliveryPolicy,
-    subscriptions,
+    subscriptions = [],
   } = service
 
   return {
@@ -45,6 +45,6 @@ export default ({
     policy: formatIamJsonPolicy(policy),
     displayName,
     deliveryPolicy,
-    subscriptions: subscriptions.map(awsSNSSubscriptionConverter),
+    subscriptions: subscriptions?.map(awsSNSSubscriptionConverter) || [],
   }
 }