feat: Run the IaC queries in validate & test in parallel

CC-594

src/lib/iac/detect-iac.ts

@@ -90,14 +90,14 @@ async function getDirectoryFiles(
   root: string,
   options: { maxDepth?: number } = {},
 ) {
-  const iacFiles: IacFileInDirectory[] = [];
   const dirPath = pathLib.resolve(root, '.');
   const supportedExtensions = new Set(Object.keys(projectTypeByFileType));
 
   const directoryPaths = makeDirectoryIterator(dirPath, {
     maxDepth: options.maxDepth,
   });
 
+  const promises: Promise<IacFileInDirectory>[] = [];
   for (const filePath of directoryPaths) {
     const fileType = pathLib
       .extname(filePath)
@@ -107,23 +107,28 @@ async function getDirectoryFiles(
       continue;
     }
 
-    try {
-      const projectType = await getProjectTypeForIacFile(filePath);
-      iacFiles.push({
-        filePath,
-        projectType,
-        fileType,
-      });
-    } catch (err) {
-      iacFiles.push({
-        filePath,
-        fileType,
-        failureReason:
-          err instanceof CustomError ? err.userMessage : 'Unhandled Error',
-      });
-    }
+    promises.push(
+      (async () => {
+        try {
+          const projectType = await getProjectTypeForIacFile(filePath);
+          return {
+            filePath,
+            projectType,
+            fileType,
+          };
+        } catch (err) {
+          return {
+            filePath,
+            fileType,
+            failureReason:
+              err instanceof CustomError ? err.userMessage : 'Unhandled Error',
+          };
+        }
+      })(),
+    );
   }
 
+  const iacFiles = await Promise.all(promises);
   if (iacFiles.length === 0) {
     throw IacDirectoryWithoutAnyIacFileError();
   }

src/lib/request/request.ts

@@ -8,6 +8,7 @@ import { getProxyForUrl } from 'proxy-from-env';
 import * as ProxyAgent from 'proxy-agent';
 import * as analytics from '../analytics';
 import { Agent } from 'http';
+import * as https from 'https';
 import { Global } from '../../cli/args';
 import { Payload } from './types';
 import { getVersion } from '../version';
@@ -93,14 +94,15 @@ export = function makeRequest(
           url = url + '?' + querystring.stringify(payload.qs);
           delete payload.qs;
         }
-
+        const agent = new https.Agent({ keepAlive: true, maxSockets: 10 });
         const options: needle.NeedleOptions = {
           json: payload.json,
           headers: payload.headers,
           timeout: payload.timeout,
           // eslint-disable-next-line @typescript-eslint/camelcase
           follow_max: 5,
           family: payload.family,
+          agent,
         };
 
         const proxyUri = getProxyForUrl(url);

src/lib/snyk-test/run-test.ts

@@ -226,23 +226,28 @@ async function sendAndParseResults(
   options: Options & TestOptions,
 ): Promise<TestResult[]> {
   const results: TestResult[] = [];
+  const promises: Promise<TestResult>[] = [];
   for (const payload of payloads) {
     await spinner.clear<void>(spinnerLbl)();
     await spinner(spinnerLbl);
     if (options.iac) {
-      const iacScan: IacScan = payload.body as IacScan;
-      analytics.add('iac type', !!iacScan.type);
-      const res = (await sendTestPayload(payload)) as IacTestResponse;
-
-      const projectName =
-        iacScan.projectNameOverride || iacScan.originalProjectName;
-      const result = await parseIacTestResult(
-        res,
-        iacScan.targetFile,
-        projectName,
-        options.severityThreshold,
+      promises.push(
+        (async () => {
+          const iacScan: IacScan = payload.body as IacScan;
+          analytics.add('iac type', !!iacScan.type);
+          const res = (await sendTestPayload(payload)) as IacTestResponse;
+
+          const projectName =
+            iacScan.projectNameOverride || iacScan.originalProjectName;
+          const result = await parseIacTestResult(
+            res,
+            iacScan.targetFile,
+            projectName,
+            options.severityThreshold,
+          );
+          return result;
+        })(),
       );
-      results.push(result);
     } else {
       /** sendTestPayload() deletes the request.body from the payload once completed. */
       const payloadCopy = Object.assign({}, payload);
@@ -292,6 +297,10 @@ async function sendAndParseResults(
       });
     }
   }
+
+  if (promises.length) {
+    return await Promise.all(promises);
+  }
   return results;
 }