snyk 1.985.0 → 1.986.0

package/dist/cli/917.index.js

@@ -712,7 +712,7 @@ exports.InvalidVarFilePath = InvalidVarFilePath;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.pull = exports.localTest = exports.cleanLocalCache = exports.trackUsage = exports.formatScanResultsV2 = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadContentForFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
+exports.pull = exports.localTest = exports.cleanLocalCache = exports.trackUsage = exports.formatScanResults = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadContentForFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
 const file_parser_1 = __webpack_require__(39331);
 const file_scanner_1 = __webpack_require__(88361);
 const results_formatter_1 = __webpack_require__(11059);
@@ -763,7 +763,7 @@ exports.applyCustomSeverities = measurableApplyCustomSeverities;
 const measurableCleanLocalCache = performanceAnalyticsDecorator(local_cache_1.cleanLocalCache, types_1.PerformanceAnalyticsKey.CacheCleanup);
 exports.cleanLocalCache = measurableCleanLocalCache;
 const measurableFormatScanResults = performanceAnalyticsDecorator(results_formatter_1.formatScanResults, types_1.PerformanceAnalyticsKey.ResultFormatting);
-exports.formatScanResultsV2 = measurableFormatScanResults;
+exports.formatScanResults = measurableFormatScanResults;
 const measurableTrackUsage = asyncPerformanceAnalyticsDecorator(usage_tracking_1.trackUsage, types_1.PerformanceAnalyticsKey.UsageTracking);
 exports.trackUsage = measurableTrackUsage;
 const measurableLocalTest = asyncPerformanceAnalyticsDecorator(index_1.test, types_1.PerformanceAnalyticsKey.Total);
@@ -1262,12 +1262,17 @@ exports.processResults = void 0;
 const policy_1 = __webpack_require__(91434);
 const share_results_1 = __webpack_require__(68971);
 const measurable_methods_1 = __webpack_require__(5687);
+const cloneDeep = __webpack_require__(83465);
 async function processResults(resultsWithCustomSeverities, orgPublicId, iacOrgSettings, policy, tags, attributes, options, projectRoot, meta) {
     let projectPublicIds = {};
     let gitRemoteUrl;
     if (options.report) {
         ({ projectPublicIds, gitRemoteUrl } = await share_results_1.formatAndShareResults({
-            results: resultsWithCustomSeverities,
+            // this is to fix a bug where we mutated the "results" in the formatAndShareResults
+            // and these were used again in the formatScanResults below
+            // resulting in double count of issues
+            // note: this happened only in multi-YAML documents
+            results: cloneDeep(resultsWithCustomSeverities),
             options,
             orgPublicId,
             policy,
@@ -1277,7 +1282,7 @@ async function processResults(resultsWithCustomSeverities, orgPublicId, iacOrgSe
             meta,
         }));
     }
-    const formattedResults = measurable_methods_1.formatScanResultsV2(resultsWithCustomSeverities, options, iacOrgSettings.meta, projectPublicIds, projectRoot, gitRemoteUrl);
+    const formattedResults = measurable_methods_1.formatScanResults(resultsWithCustomSeverities, options, iacOrgSettings.meta, projectPublicIds, projectRoot, gitRemoteUrl);
     return policy_1.filterIgnoredIssues(policy, formattedResults);
 }
 exports.processResults = processResults;
@@ -1302,10 +1307,10 @@ const cloud_config_parser_1 = __webpack_require__(98611);
 const path = __webpack_require__(85622);
 const detect_1 = __webpack_require__(45318);
 const severitiesArray = common_1.SEVERITIES.map((s) => s.verboseName);
-function formatScanResults(scanResults, options, meta, projectPublicIds, porjectRoot, gitRemoteUrl) {
+function formatScanResults(scanResults, options, meta, projectPublicIds, projectRoot, gitRemoteUrl) {
     try {
         const groupedByFile = scanResults.reduce((memo, scanResult) => {
-            const res = formatScanResult(scanResult, meta, options, porjectRoot);
+            const res = formatScanResult(scanResult, meta, options, projectRoot);
             if (memo[scanResult.filePath]) {
                 memo[scanResult.filePath].result.cloudConfigResults.push(...res.result.cloudConfigResults);
             }
@@ -3401,11 +3406,21 @@ function getErrorUserMessage(code) {
 }
 exports.getErrorUserMessage = getErrorUserMessage;
 class SnykIacTestError extends errors_1.CustomError {
-    constructor(error) {
-        super(error.message);
-        this.code = error.code;
+    constructor(scanError) {
+        super(scanError.message);
+        this.code = scanError.code;
         this.strCode = error_utils_1.getErrorStringCode(this.code);
         this.userMessage = getErrorUserMessage(this.code);
+        this.fields = Object.assign({
+            path: '',
+        }, scanError.fields);
+    }
+    get path() {
+        var _a;
+        return (_a = this.fields) === null || _a === void 0 ? void 0 : _a.path;
+    }
+    set path(path1) {
+        this.fields.path = path1;
     }
 }
 exports.SnykIacTestError = SnykIacTestError;
@@ -3621,16 +3636,16 @@ function orgSettingsToIgnoreSettings(orgSettings) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.FoundIssuesError = exports.buildOutput = void 0;
+exports.FoundIssuesError = exports.NoSuccessfulScansError = exports.buildOutput = void 0;
 const os_1 = __webpack_require__(12087);
 const json_1 = __webpack_require__(71909);
 const types_1 = __webpack_require__(55246);
 const iac_output_1 = __webpack_require__(68145);
 const iac_output_2 = __webpack_require__(68145);
 const json_2 = __webpack_require__(27019);
-const errors_1 = __webpack_require__(87198);
 const sarif_1 = __webpack_require__(87999);
-const errors_2 = __webpack_require__(55191);
+const errors_1 = __webpack_require__(55191);
+const strip_ansi_1 = __webpack_require__(76003);
 function buildOutput({ scanResult, testSpinner, projectName, orgSettings, options, }) {
     if (scanResult.results) {
         testSpinner === null || testSpinner === void 0 ? void 0 : testSpinner.succeed(iac_output_1.spinnerSuccessMessage);
@@ -3651,14 +3666,18 @@ function buildOutput({ scanResult, testSpinner, projectName, orgSettings, option
 }
 exports.buildOutput = buildOutput;
 function buildTestCommandResultData({ scanResult, projectName, orgSettings, options, }) {
-    var _a, _b;
-    let responseData = '';
+    var _a, _b, _c, _d, _e;
     const jsonData = json_2.jsonStringifyLargeObject(json_1.convertEngineToJsonResults({
         results: scanResult,
         projectName,
         orgSettings,
     }));
     const sarifData = json_2.jsonStringifyLargeObject(sarif_1.convertEngineToSarifResults(scanResult));
+    const isPartialSuccess = ((_b = (_a = scanResult.results) === null || _a === void 0 ? void 0 : _a.resources) === null || _b === void 0 ? void 0 : _b.length) || !((_c = scanResult.errors) === null || _c === void 0 ? void 0 : _c.length);
+    if (!isPartialSuccess) {
+        throw new NoSuccessfulScansError({ json: jsonData, sarif: sarifData }, scanResult.errors, options);
+    }
+    let responseData;
     if (options.json) {
         responseData = jsonData;
     }
@@ -3668,9 +3687,13 @@ function buildTestCommandResultData({ scanResult, projectName, orgSettings, opti
     else {
         responseData = buildTextOutput({ scanResult, projectName, orgSettings });
     }
-    const isFoundIssues = !!((_b = (_a = scanResult.results) === null || _a === void 0 ? void 0 : _a.vulnerabilities) === null || _b === void 0 ? void 0 : _b.length);
+    const isFoundIssues = !!((_e = (_d = scanResult.results) === null || _d === void 0 ? void 0 : _d.vulnerabilities) === null || _e === void 0 ? void 0 : _e.length);
     if (isFoundIssues) {
-        throw new FoundIssuesError({ responseData, jsonData, sarifData });
+        throw new FoundIssuesError({
+            response: responseData,
+            json: jsonData,
+            sarif: sarifData,
+        });
     }
     return { responseData, jsonData, sarifData };
 }
@@ -3684,18 +3707,10 @@ function buildTextOutput({ scanResult, projectName, orgSettings, }) {
                 shouldShowLineNumbers: true,
             });
     if (scanResult.errors) {
-        const testFailures = scanResult.errors.map((error) => {
-            var _a;
-            const formattedError = new errors_1.SnykIacTestError(error);
-            // If we received an error without a path it means that the scan failed
-            if (!((_a = error === null || error === void 0 ? void 0 : error.fields) === null || _a === void 0 ? void 0 : _a.path)) {
-                throw formattedError;
-            }
-            return {
-                filePath: error.fields.path,
-                failureReason: formattedError.userMessage,
-            };
-        });
+        const testFailures = scanResult.errors.map((error) => ({
+            filePath: error.fields.path,
+            failureReason: error.userMessage,
+        }));
         response += os_1.EOL.repeat(2) + iac_output_1.formatIacTestFailures(testFailures);
     }
     response += os_1.EOL;
@@ -3705,14 +3720,45 @@ function buildTextOutput({ scanResult, projectName, orgSettings, }) {
     response += os_1.EOL;
     return response;
 }
-class FoundIssuesError extends errors_2.CustomError {
-    constructor(props) {
-        super(props.responseData);
+class NoSuccessfulScansError extends errors_1.FormattedCustomError {
+    constructor(responseData, errors, options) {
+        const firstErr = errors[0];
+        const isText = !options.json && !options.sarif;
+        const message = options.json
+            ? responseData.json
+            : options.sarif
+                ? responseData.sarif
+                : firstErr.message;
+        super(message, isText
+            ? iac_output_1.formatIacTestFailures(errors.map((scanError) => ({
+                failureReason: scanError.userMessage,
+                filePath: scanError.fields.path,
+            })))
+            : strip_ansi_1.default(message));
+        this.strCode = firstErr.strCode;
+        this.code = firstErr.code;
+        this.json = isText ? responseData.json : message;
+        this.jsonStringifiedResults = responseData.json;
+        this.sarifStringifiedResults = responseData.sarif;
+        this.fields = firstErr.fields;
+    }
+    get path() {
+        var _a;
+        return (_a = this.fields) === null || _a === void 0 ? void 0 : _a.path;
+    }
+    set path(path1) {
+        this.fields.path = path1;
+    }
+}
+exports.NoSuccessfulScansError = NoSuccessfulScansError;
+class FoundIssuesError extends errors_1.CustomError {
+    constructor(responseData) {
+        super(responseData.response);
         this.code = 'VULNS';
         this.strCode = 'VULNS';
-        this.userMessage = props.responseData;
-        this.jsonStringifiedResults = props.jsonData;
-        this.sarifStringifiedResults = props.sarifData;
+        this.userMessage = responseData.response;
+        this.jsonStringifiedResults = responseData.json;
+        this.sarifStringifiedResults = responseData.sarif;
     }
 }
 exports.FoundIssuesError = FoundIssuesError;
@@ -3897,6 +3943,7 @@ const errors_1 = __webpack_require__(55191);
 const types_1 = __webpack_require__(94820);
 const error_utils_1 = __webpack_require__(36401);
 const newDebug = __webpack_require__(15158);
+const results_1 = __webpack_require__(89752);
 const os = __webpack_require__(12087);
 const fs = __webpack_require__(35747);
 const path = __webpack_require__(85622);
@@ -3929,14 +3976,15 @@ function scanWithConfig(options, policyEnginePath, rulesBundlePath, configPath)
     if (process.error) {
         throw new ScanError(`spawning process: ${process.error}`);
     }
-    let output;
+    let snykIacTestOutput;
     try {
-        output = JSON.parse(process.stdout);
+        snykIacTestOutput = JSON.parse(process.stdout);
     }
     catch (e) {
         throw new ScanError(`invalid output encoding: ${e}`);
     }
-    return output;
+    const testOutput = results_1.mapSnykIacTestOutputToTestOutput(snykIacTestOutput);
+    return testOutput;
 }
 function processFlags(options, rulesBundlePath, configPath) {
     var _a, _b, _c;
@@ -4001,6 +4049,31 @@ class ScanError extends errors_1.CustomError {
 }
 
 
+/***/ }),
+
+/***/ 89752:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.mapSnykIacTestOutputToTestOutput = void 0;
+const errors_1 = __webpack_require__(87198);
+function mapSnykIacTestOutputToTestOutput(snykIacOutput) {
+    var _a;
+    const errors = (_a = snykIacOutput.errors) === null || _a === void 0 ? void 0 : _a.map((err) => new errors_1.SnykIacTestError(err));
+    const errWithoutPath = errors === null || errors === void 0 ? void 0 : errors.find((err) => { var _a; return !((_a = err.fields) === null || _a === void 0 ? void 0 : _a.path); });
+    if (errWithoutPath) {
+        throw errWithoutPath;
+    }
+    return {
+        results: snykIacOutput.results,
+        errors,
+    };
+}
+exports.mapSnykIacTestOutputToTestOutput = mapSnykIacTestOutputToTestOutput;
+
+
 /***/ }),
 
 /***/ 88929: