snyk 1.844.0 → 1.848.0

package/dist/cli/293.index.js

@@ -951,8 +951,8 @@ async function testEcosystem(ecosystem, paths, options) {
     // TODO: this is an intermediate step before consolidating ecosystem plugins
     // to accept flows that act differently in the testDependencies step
     if (plugin.test) {
-        const { readableResult: res } = await plugin.test(paths, options);
-        return types_1.TestCommandResult.createHumanReadableTestCommandResult(res, '');
+        const { readableResult: res, sarifResult: sarifRes } = await plugin.test(paths, options);
+        return types_1.TestCommandResult.createHumanReadableTestCommandResult(res, '', sarifRes);
     }
     const scanResultsByPath = {};
     for (const path of paths) {
@@ -5280,7 +5280,8 @@ const output_format_1 = __webpack_require__(75802);
 const errors_1 = __webpack_require__(55191);
 const json_1 = __webpack_require__(27019);
 const analytics = __webpack_require__(82744);
-const debug = debugLib('snyk-code-test');
+debugLib.enable('snyk-code');
+const debug = debugLib('snyk-code');
 exports.codePlugin = {
     // We currently don't use scan/display. we will need to consolidate ecosystem plugins
     // to accept flows that act differently in the `testDependencies` step, as we have here
@@ -5303,24 +5304,25 @@ exports.codePlugin = {
             }
             const numOfIssues = ((_b = (_a = sarifTypedResult.runs) === null || _a === void 0 ? void 0 : _a[0].results) === null || _b === void 0 ? void 0 : _b.length) || 0;
             analytics.add('sast-issues-found', numOfIssues);
-            if (options.sarif || options.json) {
-                if (numOfIssues > 0) {
-                    if (options['no-markdown']) {
-                        (_d = (_c = sarifTypedResult.runs) === null || _c === void 0 ? void 0 : _c[0].results) === null || _d === void 0 ? void 0 : _d.forEach(({ message }) => {
-                            delete message.markdown;
-                        });
-                    }
-                    hasIssues(json_1.jsonStringifyLargeObject(sarifTypedResult));
-                }
-                return { readableResult: json_1.jsonStringifyLargeObject(sarifTypedResult) };
-            }
             const meta = output_format_1.getMeta(options, path);
             const prefix = output_format_1.getPrefix(path);
-            const readableResult = output_format_1.getCodeDisplayedOutput(sarifTypedResult, meta, prefix);
+            let readableResult = output_format_1.getCodeDisplayedOutput(sarifTypedResult, meta, prefix);
+            let sarifResult;
+            if (numOfIssues > 0 && options['no-markdown']) {
+                (_d = (_c = sarifTypedResult.runs) === null || _c === void 0 ? void 0 : _c[0].results) === null || _d === void 0 ? void 0 : _d.forEach(({ message }) => {
+                    delete message.markdown;
+                });
+            }
+            if (options['sarif-file-output']) {
+                sarifResult = json_1.jsonStringifyLargeObject(sarifTypedResult);
+            }
+            if (options.sarif || options.json) {
+                readableResult = json_1.jsonStringifyLargeObject(sarifTypedResult);
+            }
             if (numOfIssues > 0) {
-                hasIssues(readableResult);
+                hasIssues(readableResult, sarifResult);
             }
-            return { readableResult };
+            return sarifResult ? { readableResult, sarifResult } : { readableResult };
         }
         catch (error) {
             let err;
@@ -5339,7 +5341,8 @@ exports.codePlugin = {
             else {
                 err = new Error(error);
             }
-            debug(chalk_1.default.bold.red(error.statusText || error.message));
+            debug(chalk_1.default.bold.red(`statusCode:${error.code ||
+                error.statusCode}, message: ${error.statusText || error.message}`));
             throw err;
         }
     },
@@ -5350,12 +5353,17 @@ function isCodeClientError(error) {
         error.hasOwnProperty('apiName'));
 }
 function isUnauthorizedError(error) {
-    return ((error.statusCode >= 400 && error.statusCode < 500) ||
-        (error.code >= 400 && error.code < 500));
+    return (error.statusCode === 401 ||
+        error.statusCode === 403 ||
+        error.code === 403 ||
+        error.code === 401);
 }
-function hasIssues(readableResult) {
+function hasIssues(readableResult, sarifResult) {
     const err = new Error(readableResult);
     err.code = 'VULNS';
+    if (sarifResult !== undefined) {
+        err.sarifStringifiedResults = sarifResult;
+    }
     throw err;
 }