snyk 1.1150.0 → 1.1152.0

package/dist/cli/784.index.js

@@ -4731,17 +4731,8 @@ async function getCodeAnalysis(root, options, sastSettings, requestId) {
         return null;
     }
     result.analysisResults.sarif = parseSecurityResults(result.analysisResults.sarif);
-    // Filter ignored issues when using report
-    if (options.report) {
-        result.analysisResults.sarif = filterIgnoredIssues(result.analysisResults.sarif);
-    }
     return result;
 }
-function filterIgnoredIssues(codeAnalysis) {
-    const results = codeAnalysis.runs[0].results;
-    codeAnalysis.runs[0].results = results === null || results === void 0 ? void 0 : results.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; });
-    return codeAnalysis;
-}
 function severityToAnalysisSeverity(severity) {
     if (severity === legacy_1.SEVERITY.CRITICAL) {
         throw new errors_1.FeatureNotSupportedBySnykCodeError(legacy_1.SEVERITY.CRITICAL);
@@ -4915,31 +4906,38 @@ const theme_1 = __webpack_require__(86988);
 const common_1 = __webpack_require__(53110);
 const right_pad_1 = __webpack_require__(80627);
 const debug = Debug('code-output');
-function getCodeDisplayedOutput(testResults, meta, prefix) {
+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 = testResults.analysisResults.sarif;
+    const sarif = args.testResults.analysisResults.sarif;
     if (sarif.runs[0].results) {
-        const results = sarif.runs[0].results;
+        // 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)
+            : sarif.runs[0].results;
         const rulesMap = getRulesMap(sarif.runs[0].tool.driver.rules || []);
         issues = getIssues(results, rulesMap);
     }
     const issuesText = issues.low.join('') + issues.medium.join('') + issues.high.join('');
     const summaryOKText = theme_1.color.status.success(`${theme_1.icon.VALID} Test completed`);
     const codeIssueSummary = getCodeIssuesSummary(issues);
-    let summary = prefix +
+    let summary = args.prefix +
         issuesText +
         '\n' +
         summaryOKText +
         '\n\n' +
-        meta +
+        args.meta +
         '\n\n' +
         chalk_1.default.bold('Summary:') +
         '\n\n' +
         codeIssueSummary +
         '\n\n';
-    if (testResults.reportResults) {
+    if (args.testResults.reportResults) {
         summary +=
-            getCodeReportDisplayedOutput(testResults.reportResults.reportUrl) +
+            getCodeReportDisplayedOutput(args.testResults.reportResults.reportUrl) +
                 '\n\n';
     }
     return summary;
@@ -5060,6 +5058,7 @@ 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 cloneDeep = __webpack_require__(83465);
 const debug = debugLib('snyk-code');
 exports.codePlugin = {
     // We currently don't use scan/display. we will need to consolidate ecosystem plugins
@@ -5071,7 +5070,7 @@ exports.codePlugin = {
         return '';
     },
     async test(paths, options) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const requestId = uuid_1.v4();
         debug(`Request ID: ${requestId}`);
         try {
@@ -5083,7 +5082,8 @@ exports.codePlugin = {
             if (!testResults) {
                 throw new errors_1.NoSupportedSastFiles();
             }
-            const sarifTypedResult = (_a = testResults === null || testResults === void 0 ? void 0 : testResults.analysisResults) === null || _a === void 0 ? void 0 : _a.sarif;
+            // 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;
             analytics.add('sast-issues-found', numOfIssues);
             let newOrg = options.org;
@@ -5092,9 +5092,14 @@ exports.codePlugin = {
             }
             const meta = output_format_1.getMeta({ ...options, org: newOrg }, path);
             const prefix = output_format_1.getPrefix(path);
-            let readableResult = output_format_1.getCodeDisplayedOutput(testResults, meta, prefix);
+            let readableResult = output_format_1.getCodeDisplayedOutput({
+                testResults,
+                meta,
+                prefix,
+                shouldFilterIgnored: (_d = options['report']) !== null && _d !== void 0 ? _d : false,
+            });
             if (numOfIssues > 0 && options['no-markdown']) {
-                (_e = (_d = sarifTypedResult.runs) === null || _d === void 0 ? void 0 : _d[0].results) === null || _e === void 0 ? void 0 : _e.forEach(({ message }) => {
+                (_f = (_e = sarifTypedResult.runs) === null || _e === void 0 ? void 0 : _e[0].results) === null || _f === void 0 ? void 0 : _f.forEach(({ message }) => {
                     delete message.markdown;
                 });
             }