snyk 1.1141.0 → 1.1143.0

package/dist/cli/784.index.js

@@ -4090,10 +4090,10 @@ async function buildDepGraph(root, manifestFilePath, lockfilePath, lockfileVersi
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV1:
             return await lockFileParser.parseYarnLockV1Project(manifestFileContents, lockFileContents, options);
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.YarnLockV2:
-            return lockFileParser.parseYarnLockV2Project(manifestFileContents, lockFileContents, options);
+            return await lockFileParser.parseYarnLockV2Project(manifestFileContents, lockFileContents, options);
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.NpmLockV2:
         case snyk_nodejs_lockfile_parser_1.NodeLockfileVersion.NpmLockV3:
-            return lockFileParser.parseNpmLockV2Project(manifestFileContents, lockFileContents, options);
+            return await lockFileParser.parseNpmLockV2Project(manifestFileContents, lockFileContents, options);
     }
     throw new Error('Failed to build dep graph from current project');
 }
@@ -4247,7 +4247,7 @@ async function processNpmWorkspaces(root, settings, targetFiles) {
                 : pathUtil.dirname(packageJsonFileName);
             const rootLockfileName = pathUtil.join(rootDir, 'package-lock.json');
             const lockContent = get_file_contents_1.getFileContents(root, rootLockfileName);
-            const res = lockFileParser.parseNpmLockV2Project(packageJson.content, lockContent.content, {
+            const res = await lockFileParser.parseNpmLockV2Project(packageJson.content, lockContent.content, {
                 includeDevDeps: settings.dev || false,
                 strictOutOfSync: settings.strictOutOfSync || false,
                 includeOptionalDeps: false,
@@ -6188,6 +6188,8 @@ const assemble_payloads_1 = __webpack_require__(38080);
 const request_1 = __webpack_require__(52050);
 const spinner_1 = __webpack_require__(86766);
 const dep_graph_1 = __webpack_require__(73399);
+const common_1 = __webpack_require__(70527);
+const common_2 = __webpack_require__(53110);
 const debug = debugModule('snyk:run-test');
 // Controls the number of simultaneous test requests that can be in-flight.
 const MAX_CONCURRENCY = 5;
@@ -6295,12 +6297,32 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
         await spinner_1.spinner(spinnerLbl);
     }
     const requests = [];
-    for (const payload of payloads) {
+    for (const originalPayload of payloads) {
         const request = async () => {
-            /** sendTestPayload() deletes the request.body from the payload once completed. */
-            const originalPayload = Object.assign({}, payload);
-            const response = await sendTestPayload(payload);
-            return { payload, originalPayload, response };
+            let step = 0;
+            let error;
+            while (step < common_2.RETRY_ATTEMPTS) {
+                debug(`sendTestPayload retry step ${step} out of ${common_2.RETRY_ATTEMPTS}`);
+                try {
+                    /** sendTestPayload() deletes the request.body from the payload once completed. */
+                    const payload = Object.assign({}, originalPayload);
+                    const response = await sendTestPayload(payload);
+                    return { payload, originalPayload, response };
+                }
+                catch (err) {
+                    error = err;
+                    step++;
+                    if (err instanceof errors_1.InternalServerError ||
+                        err instanceof errors_1.BadGatewayError ||
+                        err instanceof errors_1.ServiceUnavailableError) {
+                        await common_1.sleep(common_2.RETRY_DELAY);
+                    }
+                    else {
+                        break;
+                    }
+                }
+            }
+            throw error;
         };
         requests.push(request);
     }
@@ -6489,6 +6511,14 @@ function handleTestHttpErrorResponse(res, body) {
             err = new errors_1.InternalServerError(userMessage);
             err.innerError = body.stack;
             break;
+        case 502:
+            err = new errors_1.BadGatewayError(userMessage);
+            err.innerError = body.stack;
+            break;
+        case 503:
+            err = new errors_1.ServiceUnavailableError(userMessage);
+            err.innerError = body.stack;
+            break;
         default:
             err = new errors_1.FailedToGetVulnerabilitiesError(userMessage, statusCode);
             err.innerError = body.error;