snyk 1.1159.0 → 1.1161.0

package/dist/cli/784.index.js

@@ -4936,10 +4936,8 @@ const chalk_1 = __webpack_require__(32589);
 const theme_1 = __webpack_require__(86988);
 const common_1 = __webpack_require__(53110);
 const right_pad_1 = __webpack_require__(80627);
+const utils_1 = __webpack_require__(33113);
 const debug = Debug('code-output');
-function filterIgnoredIssues(analysisResults) {
-    return analysisResults.filter((rule) => { var _a, _b; return ((_b = (_a = rule.suppressions) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0; });
-}
 function getCodeDisplayedOutput(args) {
     let issues = {};
     const sarif = args.testResults.analysisResults.sarif;
@@ -4947,7 +4945,7 @@ function getCodeDisplayedOutput(args) {
         // Filter ignored issues (suppressions) from the sarif to display in the cli output
         // The sarif will remain unchanged and contain the suppressions
         const results = args.shouldFilterIgnored
-            ? filterIgnoredIssues(sarif.runs[0].results)
+            ? utils_1.filterIgnoredIssues(sarif.runs[0].results)
             : sarif.runs[0].results;
         const rulesMap = getRulesMap(sarif.runs[0].tool.driver.rules || []);
         issues = getIssues(results, rulesMap);
@@ -5088,6 +5086,7 @@ const settings_1 = __webpack_require__(24930);
 const output_format_1 = __webpack_require__(75802);
 const errors_1 = __webpack_require__(55191);
 const errors_2 = __webpack_require__(61315);
+const utils_1 = __webpack_require__(33113);
 const json_1 = __webpack_require__(27019);
 const analytics = __webpack_require__(82744);
 const cloneDeep = __webpack_require__(83465);
@@ -5102,7 +5101,7 @@ exports.codePlugin = {
         return '';
     },
     async test(paths, options) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         const requestId = uuid_1.v4();
         debug(`Request ID: ${requestId}`);
         try {
@@ -5116,7 +5115,14 @@ exports.codePlugin = {
             }
             // cloneDeep is used so the sarif is not changed when using the testResults getting the displayed output
             const sarifTypedResult = cloneDeep((_a = testResults === null || testResults === void 0 ? void 0 : testResults.analysisResults) === null || _a === void 0 ? void 0 : _a.sarif);
-            const numOfIssues = ((_c = (_b = sarifTypedResult.runs) === null || _b === void 0 ? void 0 : _b[0].results) === null || _c === void 0 ? void 0 : _c.length) || 0;
+            const sarifRunResults = (_c = (_b = sarifTypedResult.runs) === null || _b === void 0 ? void 0 : _b[0].results) !== null && _c !== void 0 ? _c : [];
+            // Report flow includes ignored issues (suppressions) in the results.
+            const hasIgnoredIssues = (_d = options['report']) !== null && _d !== void 0 ? _d : false;
+            // If suppressions are included in results filter them out to get real issue count
+            const foundIssues = hasIgnoredIssues
+                ? utils_1.filterIgnoredIssues(sarifRunResults)
+                : sarifRunResults;
+            const numOfIssues = foundIssues.length || 0;
             analytics.add('sast-issues-found', numOfIssues);
             let newOrg = options.org;
             if (!newOrg && sastSettings.org) {
@@ -5128,23 +5134,30 @@ exports.codePlugin = {
                 testResults,
                 meta,
                 prefix,
-                shouldFilterIgnored: (_d = options['report']) !== null && _d !== void 0 ? _d : false,
+                shouldFilterIgnored: hasIgnoredIssues,
             });
-            if (numOfIssues > 0 && options['no-markdown']) {
-                (_f = (_e = sarifTypedResult.runs) === null || _e === void 0 ? void 0 : _e[0].results) === null || _f === void 0 ? void 0 : _f.forEach(({ message }) => {
+            if (options['no-markdown']) {
+                sarifRunResults.forEach(({ message }) => {
                     delete message.markdown;
                 });
             }
+            const shouldStringifyResult = options['sarif-file-output'] ||
+                options.sarif ||
+                options['json-file-output'] ||
+                options.json;
+            const stringifiedResult = shouldStringifyResult
+                ? json_1.jsonStringifyLargeObject(sarifTypedResult)
+                : '';
             let sarifResult;
             if (options['sarif-file-output']) {
-                sarifResult = json_1.jsonStringifyLargeObject(sarifTypedResult);
+                sarifResult = stringifiedResult;
             }
             let jsonResult;
             if (options['json-file-output']) {
-                jsonResult = json_1.jsonStringifyLargeObject(sarifTypedResult);
+                jsonResult = stringifiedResult;
             }
             if (options.sarif || options.json) {
-                readableResult = json_1.jsonStringifyLargeObject(sarifTypedResult);
+                readableResult = stringifiedResult;
             }
             if (numOfIssues > 0) {
                 throwIssuesError({ readableResult, sarifResult, jsonResult });
@@ -5257,6 +5270,21 @@ async function getSastSettings(options) {
 exports.getSastSettings = getSastSettings;
 
 
+/***/ }),
+
+/***/ 72290:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.filterIgnoredIssues = void 0;
+function filterIgnoredIssues(analysisResults) {
+    return analysisResults.filter((rule) => { var _a, _b; return ((_b = (_a = rule.suppressions) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0; });
+}
+exports.filterIgnoredIssues = filterIgnoredIssues;
+
+
 /***/ }),
 
 /***/ 33113:
@@ -5267,6 +5295,8 @@ exports.getSastSettings = getSastSettings;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 var testEmitter_1 = __webpack_require__(83901);
 Object.defineProperty(exports, "analysisProgressUpdate", ({ enumerable: true, get: function () { return testEmitter_1.analysisProgressUpdate; } }));
+var filter_1 = __webpack_require__(72290);
+Object.defineProperty(exports, "filterIgnoredIssues", ({ enumerable: true, get: function () { return filter_1.filterIgnoredIssues; } }));
 
 
 /***/ }),