snyk 1.868.0 → 1.869.0

package/dist/cli/917.index.js

@@ -990,7 +990,6 @@ 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 handle_terraform_files_1 = __webpack_require__(41806);
 // this method executes the local processing engine and then formats the results to adapt with the CLI output.
 // this flow is the default GA flow for IAC scanning.
 async function test(pathToScan, options) {
@@ -1029,7 +1028,7 @@ async function test(pathToScan, options) {
         // we may have loaded and parsed all but terraform files in the previous step
         // so now we check if we need to do a second load and parse which dereferences TF vars
         if (validFileTypes && !validFileTypes.includes(types_1.ValidFileType.Terraform)) {
-            const { allParsedFiles, allFailedFiles, } = await handle_terraform_files_1.loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles, options.detectionDepth);
+            const { allParsedFiles, allFailedFiles, } = await measurable_methods_1.loadAndParseTerraformFiles(pathToScan, parsedFiles, failedFiles, options.detectionDepth);
             parsedFiles = allParsedFiles;
             failedFiles = allFailedFiles;
         }
@@ -1044,7 +1043,7 @@ async function test(pathToScan, options) {
         const resultsWithCustomSeverities = await measurable_methods_1.applyCustomSeverities(scannedFiles, iacOrgSettings.customPolicies);
         let projectPublicIds = {};
         if (options.report) {
-            projectPublicIds = await share_results_1.formatAndShareResults(resultsWithCustomSeverities, options, orgPublicId);
+            projectPublicIds = await share_results_1.formatAndShareResults(resultsWithCustomSeverities, options, orgPublicId, policy);
         }
         const formattedResults = measurable_methods_1.formatScanResults(resultsWithCustomSeverities, options, iacOrgSettings.meta, projectPublicIds);
         const { filteredIssues, ignoreCount } = policy_1.filterIgnoredIssues(policy, formattedResults);
@@ -1289,7 +1288,7 @@ exports.calculatePercentage = (relativeValue, totalValue) => +(totalValue ? (rel
 "use strict";
 
 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.loadFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
+exports.loadAndParseTerraformFiles = exports.pull = exports.localTest = exports.cleanLocalCache = exports.trackUsage = exports.formatScanResults = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
 const file_loader_1 = __webpack_require__(13552);
 const file_parser_1 = __webpack_require__(2314);
 const file_scanner_1 = __webpack_require__(16879);
@@ -1302,6 +1301,7 @@ const index_1 = __webpack_require__(55409);
 const oci_pull_1 = __webpack_require__(5029);
 const analytics_1 = __webpack_require__(22716);
 const types_1 = __webpack_require__(42258);
+const handle_terraform_files_1 = __webpack_require__(41806);
 // Note: The return type of the returned async function needs to be Promise<Val> for
 // the compiler to be happy, so we need to unwrap it with the messy
 // Awaiter<ReturnType<T>> rather than just using ReturnType<T> directly.
@@ -1347,6 +1347,8 @@ const measurableLocalTest = asyncPerformanceAnalyticsDecorator(index_1.test, typ
 exports.localTest = measurableLocalTest;
 const measurableOciPull = asyncPerformanceAnalyticsDecorator(oci_pull_1.pull, types_1.PerformanceAnalyticsKey.Total);
 exports.pull = measurableOciPull;
+const measurableLoadAndParseTerraformFiles = asyncPerformanceAnalyticsDecorator(handle_terraform_files_1.loadAndParseTerraformFiles, types_1.PerformanceAnalyticsKey.Total);
+exports.loadAndParseTerraformFiles = measurableLoadAndParseTerraformFiles;
 
 
 /***/ }),
@@ -2234,13 +2236,13 @@ 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) {
+async function formatAndShareResults(results, options, orgPublicId, policy) {
     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(formattedResults);
+    return await cli_share_results_1.shareResults(formattedResults, policy);
 }
 exports.formatAndShareResults = formatAndShareResults;
 
@@ -3343,8 +3345,8 @@ const request_1 = __webpack_require__(52050);
 const api_token_1 = __webpack_require__(95181);
 const envelope_formatters_1 = __webpack_require__(88784);
 const authentication_failed_error_1 = __webpack_require__(23770);
-async function shareResults(results) {
-    const scanResults = results.map(envelope_formatters_1.convertIacResultToScanResult);
+async function shareResults(results, policy) {
+    const scanResults = results.map((result) => envelope_formatters_1.convertIacResultToScanResult(result, policy));
     const { res, body } = await request_1.makeRequest({
         method: 'POST',
         url: `${config_1.default.API}/iac-cli-share-results`,
@@ -3371,7 +3373,8 @@ exports.shareResults = shareResults;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.convertIacResultToScanResult = void 0;
-function convertIacResultToScanResult(iacResult) {
+function convertIacResultToScanResult(iacResult, policy) {
+    var _a;
     return {
         identity: {
             type: iacResult.projectType,
@@ -3386,6 +3389,7 @@ function convertIacResultToScanResult(iacResult) {
         }),
         name: iacResult.projectName,
         target: { name: iacResult.projectName },
+        policy: (_a = policy === null || policy === void 0 ? void 0 : policy.toString()) !== null && _a !== void 0 ? _a : '',
     };
 }
 exports.convertIacResultToScanResult = convertIacResultToScanResult;