Merge pull request #109 from snyk-tech-services/feat/bump-per-page

feat: call licenses & deps API in parallel
snyk-tech-services · Oct 14, 2022 · 22d8f79 · 22d8f79
2 parents 1d2d43d + b76e177
commit 22d8f79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/lib/api/org/dependencies.ts b/src/lib/api/org/dependencies.ts
@@ -41,9 +41,10 @@ async function getAllDependenciesData(
     results: [],
     total: undefined,
   };
-  const perPage = 20; // this is a max on that endpoint
+  const perPage = 20; // 1000 is a max on that endpoint, however anything other than 20 is not working
 
   let currentPage = page;
+
   let hasMorePages = true;
 
   while (hasMorePages) {

diff --git a/src/lib/api/org/licenses.ts b/src/lib/api/org/licenses.ts
@@ -4,7 +4,6 @@ import * as snykApiSdk from 'snyk-api-ts-client';
 import { getApiToken } from '../../get-api-token';
 import { requestsManager } from 'snyk-request-manager';
 import { GetLicenseDataOptions } from '../../types';
-import { number } from 'yargs';
 
 const debug = debugLib('snyk-licenses:getLicenseDataForOrg');
 

diff --git a/src/lib/generate-org-license-report.ts b/src/lib/generate-org-license-report.ts
@@ -33,18 +33,17 @@ export async function generateLicenseData(
   debug(`ℹ️  Generating license data for Org:${orgPublicId}`);
 
   try {
-    const licenseData = await getLicenseDataForOrg(orgPublicId, options);
+    const [licenseData, dependenciesDataRaw] = await Promise.all([
+      getLicenseDataForOrg(orgPublicId, options),
+      getDependenciesDataForOrg(orgPublicId, options),
+    ]);
     if (!licenseData.total) {
       debug(`ℹ️  Detected 0 licenses`);
       throw new Error(
         'No licenses returned from /licenses Snyk API. Please make sure the org has licenses configured and try again.',
       );
     }
     debug(`✅ Got license API data for Org:${orgPublicId}`);
-    const dependenciesDataRaw = await getDependenciesDataForOrg(
-      orgPublicId,
-      options,
-    );
     if (!dependenciesDataRaw.total || dependenciesDataRaw.total === 0) {
       debug(`ℹ️  API returned 0 dependencies`);
     } else {