fix(services): fix waf service for global instances

Author: tyler-dunkel

src/services/wafV2WebAcl/data.ts

@@ -29,29 +29,31 @@ export default async ({
 }: {
   regions: string
   config: Config
-}): Promise<{[region: string]: RawAwsWafV2WebAcl[]}> => {
+}): Promise<{ [region: string]: RawAwsWafV2WebAcl[] }> => {
   const result: RawAwsWafV2WebAcl[] = []
 
   const activeRegions = regions.split(',')
-  // TODO: how to support global instances
   activeRegions.push('global')
   for (const region of activeRegions) {
-    const client = new WAFV2({ ...config, region: region === 'global' ? 'us-east-1' : region, endpoint })
+    const client = new WAFV2({
+      ...config,
+      region: region === 'global' ? 'us-east-1' : region,
+      endpoint,
+    })
     const scope = region === 'global' ? scopes.cloudfront : scopes.regional
     const WafV2WebAclData: WebACLSummaries = []
     try {
-      const { WebACLs, NextMarker } = await client.listWebACLs({ Scope: scope, Limit: 10 }).promise()
+      const { WebACLs, NextMarker } = await client
+        .listWebACLs({ Scope: scope, Limit: 10 })
+        .promise()
       WafV2WebAclData.push(...WebACLs)
       let marker = NextMarker
-      while(marker) {
-        const { WebACLs, NextMarker } = await client.listWebACLs({ Scope: scope, Limit: 10, NextMarker: marker }).promise()
-        // There is some issue with wafV2 where it always returns a next marker
-        if (WebACLs.find(({ Name }) => Name === NextMarker)) {
-          marker = undefined
-        } else {
-          marker = NextMarker
-          WafV2WebAclData.push(...WebACLs)
-        }
+      while (marker) {
+        const { WebACLs, NextMarker } = await client
+          .listWebACLs({ Scope: scope, Limit: 10, NextMarker: marker })
+          .promise()
+        marker = NextMarker
+        WafV2WebAclData.push(...WebACLs)
       }
     } catch (err) {
       errorLog.generateAwsErrorLog({ functionName: 'listWebAcls', err })
@@ -65,12 +67,19 @@ export default async ({
             .promise()
 
           const arn = wafData?.WebACL?.ARN
-          const loggingConfiguration = await client.getLoggingConfiguration({ ResourceArn: arn }).promise()
-          wafData.loggingConfiguration = loggingConfiguration.LoggingConfiguration
+          const loggingConfiguration = await client
+            .getLoggingConfiguration({ ResourceArn: arn })
+            .promise()
+          wafData.loggingConfiguration =
+            loggingConfiguration.LoggingConfiguration
         } catch (err) {
           errorLog.generateAwsErrorLog({ functionName: 'getWebACL', err })
         }
-        result.push({ ...wafData?.WebACL, loggingConfiguration: wafData?.loggingConfiguration, region })
+        result.push({
+          ...wafData?.WebACL,
+          loggingConfiguration: wafData?.loggingConfiguration,
+          region,
+        })
       }
     }
   }