snyk 1.897.0 → 1.898.0

package/dist/cli/917.index.js

@@ -518,15 +518,14 @@ const detect_1 = __webpack_require__(45318);
 const types_1 = __webpack_require__(42258);
 const analytics_1 = __webpack_require__(22716);
 const usage_tracking_1 = __webpack_require__(43156);
-const policy_1 = __webpack_require__(25476);
 const measurable_methods_1 = __webpack_require__(78272);
 const unsupported_entitlement_error_1 = __webpack_require__(78673);
 const config_1 = __webpack_require__(22541);
-const policy_2 = __webpack_require__(32615);
+const policy_1 = __webpack_require__(32615);
 const feature_flags_1 = __webpack_require__(63011);
 const rules_1 = __webpack_require__(98895);
 const file_loader_1 = __webpack_require__(13552);
-const share_results_1 = __webpack_require__(3558);
+const process_results_1 = __webpack_require__(59964);
 const monitor_1 = __webpack_require__(3708);
 const directory_loader_1 = __webpack_require__(71484);
 // this method executes the local processing engine and then formats the results to adapt with the CLI output.
@@ -544,7 +543,7 @@ async function test(pathToScan, options) {
         const tags = parseTags(options);
         const attributes = parseAttributes(options);
         const rulesOrigin = await rules_1.initRules(iacOrgSettings, options);
-        const policy = await policy_2.findAndLoadPolicy(pathToScan, 'iac', options);
+        const policy = await policy_1.findAndLoadPolicy(pathToScan, 'iac', options);
         const isTFVarSupportEnabled = (await feature_flags_1.isFeatureFlagSupportedForOrg('iacTerraformVarSupport', iacOrgSettings.meta.org)).ok;
         let allParsedFiles = [], allFailedFiles = [];
         const allDirectories = directory_loader_1.getAllDirectoriesForPath(pathToScan, options.detectionDepth);
@@ -574,22 +573,10 @@ async function test(pathToScan, options) {
                 engineType: types_1.EngineType.Custom,
             })));
         }
+        // TODO: decide if this should go into scanFiles or stay here
         const scannedFiles = await measurable_methods_1.scanFiles(allParsedFiles);
         const resultsWithCustomSeverities = await measurable_methods_1.applyCustomSeverities(scannedFiles, iacOrgSettings.customPolicies);
-        let projectPublicIds = {};
-        let gitRemoteUrl;
-        if (options.report) {
-            ({ projectPublicIds, gitRemoteUrl } = await share_results_1.formatAndShareResults({
-                results: resultsWithCustomSeverities,
-                options,
-                orgPublicId,
-                policy,
-                tags,
-                attributes,
-            }));
-        }
-        const formattedResults = measurable_methods_1.formatScanResults(resultsWithCustomSeverities, options, iacOrgSettings.meta, projectPublicIds, gitRemoteUrl);
-        const { filteredIssues, ignoreCount } = policy_1.filterIgnoredIssues(policy, formattedResults);
+        const { filteredIssues, ignoreCount } = await process_results_1.processResults(resultsWithCustomSeverities, orgPublicId, iacOrgSettings, policy, tags, attributes, options);
         try {
             await measurable_methods_1.trackUsage(filteredIssues);
         }
@@ -650,7 +637,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 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__(2314);
 const file_scanner_1 = __webpack_require__(16879);
-const results_formatter_1 = __webpack_require__(98425);
+const results_formatter_1 = __webpack_require__(95067);
 const usage_tracking_1 = __webpack_require__(43156);
 const local_cache_1 = __webpack_require__(6255);
 const apply_custom_severities_1 = __webpack_require__(91470);
@@ -1013,7 +1000,38 @@ exports.FailedToExtractResourcesInTerraformPlanError = FailedToExtractResourcesI
 
 /***/ }),
 
-/***/ 25476:
+/***/ 59964:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.processResults = void 0;
+const policy_1 = __webpack_require__(37457);
+const share_results_1 = __webpack_require__(45888);
+const measurable_methods_1 = __webpack_require__(78272);
+async function processResults(resultsWithCustomSeverities, orgPublicId, iacOrgSettings, policy, tags, attributes, options) {
+    let projectPublicIds = {};
+    let gitRemoteUrl;
+    if (options.report) {
+        ({ projectPublicIds, gitRemoteUrl } = await share_results_1.formatAndShareResults({
+            results: resultsWithCustomSeverities,
+            options,
+            orgPublicId,
+            policy,
+            tags,
+            attributes,
+        }));
+    }
+    const formattedResults = measurable_methods_1.formatScanResults(resultsWithCustomSeverities, options, iacOrgSettings.meta, projectPublicIds, gitRemoteUrl);
+    return policy_1.filterIgnoredIssues(policy, formattedResults);
+}
+exports.processResults = processResults;
+
+
+/***/ }),
+
+/***/ 37457:
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -1079,7 +1097,7 @@ function toFormattedResult(adapter) {
 
 /***/ }),
 
-/***/ 98425:
+/***/ 95067:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -1211,6 +1229,78 @@ class FailedToFormatResults extends errors_1.CustomError {
 exports.FailedToFormatResults = FailedToFormatResults;
 
 
+/***/ }),
+
+/***/ 44554:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.formatShareResults = void 0;
+const file_utils_1 = __webpack_require__(58486);
+function formatShareResults(scanResults, options) {
+    const resultsGroupedByFilePath = groupByFilePath(scanResults);
+    return resultsGroupedByFilePath.map((result) => {
+        const { projectName, targetFile } = file_utils_1.computePaths(result.filePath, options.path);
+        return {
+            projectName,
+            targetFile,
+            filePath: result.filePath,
+            fileType: result.fileType,
+            projectType: result.projectType,
+            violatedPolicies: result.violatedPolicies,
+        };
+    });
+}
+exports.formatShareResults = formatShareResults;
+function groupByFilePath(scanResults) {
+    const groupedByFilePath = scanResults.reduce((memo, scanResult) => {
+        scanResult.violatedPolicies.forEach((violatedPolicy) => {
+            violatedPolicy.docId = scanResult.docId;
+        });
+        if (memo[scanResult.filePath]) {
+            memo[scanResult.filePath].violatedPolicies.push(...scanResult.violatedPolicies);
+        }
+        else {
+            memo[scanResult.filePath] = scanResult;
+        }
+        return memo;
+    }, {});
+    return Object.values(groupedByFilePath);
+}
+
+
+/***/ }),
+
+/***/ 45888:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.formatAndShareResults = void 0;
+const feature_flags_1 = __webpack_require__(63011);
+const cli_share_results_1 = __webpack_require__(24016);
+const assert_iac_options_flag_1 = __webpack_require__(68590);
+const share_results_formatter_1 = __webpack_require__(44554);
+async function formatAndShareResults({ results, options, orgPublicId, policy, tags, attributes, }) {
+    const isCliReportEnabled = await feature_flags_1.isFeatureFlagSupportedForOrg('iacCliShareResults', orgPublicId);
+    if (!isCliReportEnabled.ok) {
+        throw new assert_iac_options_flag_1.FeatureFlagError('report', 'iacCliShareResults');
+    }
+    const formattedResults = share_results_formatter_1.formatShareResults(results, options);
+    return await cli_share_results_1.shareResults({
+        results: formattedResults,
+        policy,
+        tags,
+        attributes,
+        options,
+    });
+}
+exports.formatAndShareResults = formatAndShareResults;
+
+
 /***/ }),
 
 /***/ 98895:
@@ -1375,78 +1465,6 @@ class FailedToExecuteCustomRulesError extends errors_1.CustomError {
 exports.FailedToExecuteCustomRulesError = FailedToExecuteCustomRulesError;
 
 
-/***/ }),
-
-/***/ 37324:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.formatShareResults = void 0;
-const file_utils_1 = __webpack_require__(58486);
-function formatShareResults(scanResults, options) {
-    const resultsGroupedByFilePath = groupByFilePath(scanResults);
-    return resultsGroupedByFilePath.map((result) => {
-        const { projectName, targetFile } = file_utils_1.computePaths(result.filePath, options.path);
-        return {
-            projectName,
-            targetFile,
-            filePath: result.filePath,
-            fileType: result.fileType,
-            projectType: result.projectType,
-            violatedPolicies: result.violatedPolicies,
-        };
-    });
-}
-exports.formatShareResults = formatShareResults;
-function groupByFilePath(scanResults) {
-    const groupedByFilePath = scanResults.reduce((memo, scanResult) => {
-        scanResult.violatedPolicies.forEach((violatedPolicy) => {
-            violatedPolicy.docId = scanResult.docId;
-        });
-        if (memo[scanResult.filePath]) {
-            memo[scanResult.filePath].violatedPolicies.push(...scanResult.violatedPolicies);
-        }
-        else {
-            memo[scanResult.filePath] = scanResult;
-        }
-        return memo;
-    }, {});
-    return Object.values(groupedByFilePath);
-}
-
-
-/***/ }),
-
-/***/ 3558:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.formatAndShareResults = void 0;
-const feature_flags_1 = __webpack_require__(63011);
-const cli_share_results_1 = __webpack_require__(24016);
-const assert_iac_options_flag_1 = __webpack_require__(68590);
-const share_results_formatter_1 = __webpack_require__(37324);
-async function formatAndShareResults({ results, options, orgPublicId, policy, tags, attributes, }) {
-    const isCliReportEnabled = await feature_flags_1.isFeatureFlagSupportedForOrg('iacCliShareResults', orgPublicId);
-    if (!isCliReportEnabled.ok) {
-        throw new assert_iac_options_flag_1.FeatureFlagError('report', 'iacCliShareResults');
-    }
-    const formattedResults = share_results_formatter_1.formatShareResults(results, options);
-    return await cli_share_results_1.shareResults({
-        results: formattedResults,
-        policy,
-        tags,
-        attributes,
-        options,
-    });
-}
-exports.formatAndShareResults = formatAndShareResults;
-
-
 /***/ }),
 
 /***/ 80256:
@@ -1635,6 +1653,13 @@ async function test(...args) {
     // Holds an array of scanned file metadata for output.
     let iacScanFailures;
     let iacOutputMeta;
+    const isNewIacOutputSupported = options.iac
+        ? await feature_flags_1.hasFeatureFlag('iacCliOutput', options)
+        : false;
+    if (shouldPrintIacInitialMessage(options, isNewIacOutputSupported)) {
+        console.log(os_1.EOL +
+            chalk_1.default.white.bold('Snyk testing Infrastructure as Code configuration issues...'));
+    }
     // Promise waterfall to test all other paths sequentially
     for (const path of paths) {
         // Create a copy of the options so a specific test can
@@ -1730,9 +1755,6 @@ async function test(...args) {
         err.sarifStringifiedResults = stringifiedSarifData;
         throw err;
     }
-    const isNewIacOutputSupported = options.iac
-        ? await feature_flags_1.hasFeatureFlag('iacCliOutput', options)
-        : false;
     let response = results
         .map((result, i) => {
         return display_result_1.displayResult(results[i], {
@@ -1829,6 +1851,9 @@ function shouldFail(vulnerableResults, failOn) {
     // should fail by default when there are vulnerable results
     return vulnerableResults.length > 0;
 }
+function shouldPrintIacInitialMessage(options, iacCliOutputFeatureFlag) {
+    return !options.json && !options.sarif && iacCliOutputFeatureFlag;
+}
 
 
 /***/ }),