snyk 1.1028.0 → 1.1030.0

package/dist/cli/784.index.js

@@ -1021,8 +1021,8 @@ const plugin_analytics_1 = __webpack_require__(33077);
 const policy_1 = __webpack_require__(32615);
 const policy_2 = __webpack_require__(4669);
 const feature_flags_1 = __webpack_require__(63011);
-const common_1 = __webpack_require__(74434);
 const utils_1 = __webpack_require__(97875);
+const common_1 = __webpack_require__(70527);
 async function resolveAndTestFacts(ecosystem, scans, options) {
     const unmanagedDepsOverride = process.env.USE_UNMANAGED_DEPS;
     const featureFlagEnabled = await feature_flags_1.hasFeatureFlag('snykNewUnmanagedTest', options);
@@ -1035,20 +1035,22 @@ async function submitHashes(hashes, orgId) {
     const response = await polling_test_1.createDepGraph(hashes, orgId);
     return response.data.id;
 }
-async function pollDepGraph(id, orgId) {
-    let attempts = 0;
-    const maxAttempts = 50;
-    while (attempts < maxAttempts) {
-        try {
-            const response = await polling_test_1.getDepGraph(id, orgId);
-            return response.data.attributes;
-        }
-        catch (e) {
-            await common_1.delayNextStep(attempts, maxAttempts, 1000);
-            attempts++;
+async function pollDepGraphAttributes(id, orgId) {
+    const maxIntervalMs = 60000;
+    const minIntervalMs = 5000;
+    const maxAttempts = 31; // Corresponds to 25.5 minutes
+    // Loop until we receive a response that is not in progress,
+    // or we receive something else than http status code 200.
+    for (let i = 1; i <= maxAttempts; i++) {
+        const graph = await polling_test_1.getDepGraph(id, orgId);
+        if (graph.data.attributes.in_progress) {
+            const pollInterval = Math.max(maxIntervalMs, minIntervalMs * i);
+            await common_1.sleep(pollInterval * i);
+            continue;
         }
+        return graph.data.attributes;
     }
-    return Promise.reject('Failed to get DepGraph');
+    throw new Error('max retries reached');
 }
 async function fetchIssues(start_time, dep_graph_data, component_details, orgId) {
     var _a, _b;
@@ -1093,7 +1095,7 @@ async function resolveAndTestFactsUnmanagedDeps(scans, options) {
         for (const scanResult of scanResults) {
             try {
                 const id = await submitHashes({ hashes: (_a = scanResult === null || scanResult === void 0 ? void 0 : scanResult.facts[0]) === null || _a === void 0 ? void 0 : _a.data }, orgId);
-                const { start_time, dep_graph_data, component_details, } = await pollDepGraph(id, orgId);
+                const { start_time, dep_graph_data, component_details, } = await pollDepGraphAttributes(id, orgId);
                 const { issues, issuesData, depGraphData, dependencyCount, depsFilePaths, fileSignaturesDetails, } = await fetchIssues(start_time, dep_graph_data, component_details, orgId);
                 const issuesMap = new Map();
                 issues.forEach((i) => {
@@ -1101,8 +1103,8 @@ async function resolveAndTestFactsUnmanagedDeps(scans, options) {
                 });
                 const vulnerabilities = [];
                 for (const issuesDataKey in issuesData) {
-                    const issueData = issuesData[issuesDataKey];
                     const pkgCoordinate = `${(_b = issuesMap[issuesDataKey]) === null || _b === void 0 ? void 0 : _b.pkgName}@${(_c = issuesMap[issuesDataKey]) === null || _c === void 0 ? void 0 : _c.pkgVersion}`;
+                    const issueData = issuesData[issuesDataKey];
                     issueData.from = [pkgCoordinate];
                     issueData.name = pkgCoordinate;
                     issueData.packageManager = packageManager;
@@ -5115,7 +5117,6 @@ const promise_1 = __webpack_require__(90430);
 const common_1 = __webpack_require__(53110);
 const api_token_1 = __webpack_require__(95181);
 const common_2 = __webpack_require__(74434);
-const common_3 = __webpack_require__(70527);
 async function getIssues(issuesRequestAttributes, orgId) {
     const payload = {
         method: 'POST',
@@ -5143,25 +5144,7 @@ async function getDepGraph(id, orgId) {
             authorization: api_token_1.getAuthHeader(),
         },
     };
-    const maxWaitingTimeMs = 30000;
-    const pollIntervalMs = 5000;
-    let waitingTimeMs = pollIntervalMs;
-    let result = {};
-    while (waitingTimeMs <= maxWaitingTimeMs) {
-        try {
-            await common_3.sleep(waitingTimeMs);
-            result = await promise_1.makeRequest(payload);
-            break;
-        }
-        catch (e) {
-            if (waitingTimeMs < maxWaitingTimeMs) {
-                waitingTimeMs += pollIntervalMs;
-            }
-            else {
-                throw e;
-            }
-        }
-    }
+    const result = await promise_1.makeRequest(payload);
     return JSON.parse(result.toString());
 }
 exports.getDepGraph = getDepGraph;