snyk 1.918.0 → 1.919.0

package/dist/cli/784.index.js

@@ -109,7 +109,7 @@ async function monitor(...args0) {
     }
     const ecosystem = ecosystems_1.getEcosystem(options);
     if (ecosystem) {
-        const commandResult = await ecosystems_1.monitorEcosystem(ecosystem, paths, options);
+        const commandResult = await ecosystems_1.monitorEcosystem(ecosystem, paths, options, contributors);
         const [monitorResults, monitorErrors] = commandResult;
         return await monitor_2.getFormattedMonitorOutput(results, monitorResults, monitorErrors, options);
     }
@@ -615,7 +615,7 @@ const monitor_1 = __webpack_require__(3708);
 const common_1 = __webpack_require__(69813);
 const policy_2 = __webpack_require__(32615);
 const SEPARATOR = '\n-------------------------------------------------------\n';
-async function monitorEcosystem(ecosystem, paths, options) {
+async function monitorEcosystem(ecosystem, paths, options, contributors) {
     const plugin = plugins_1.getPlugin(ecosystem);
     monitor_1.validateTags(options);
     monitor_1.validateProjectAttributes(options);
@@ -646,13 +646,13 @@ async function monitorEcosystem(ecosystem, paths, options) {
             spinner_1.spinner.clearAll();
         }
     }
-    const [monitorResults, errors] = await selectAndExecuteMonitorStrategy(ecosystem, scanResultsByPath, options);
+    const [monitorResults, errors] = await selectAndExecuteMonitorStrategy(ecosystem, scanResultsByPath, options, contributors);
     return [monitorResults, errors];
 }
 exports.monitorEcosystem = monitorEcosystem;
-async function selectAndExecuteMonitorStrategy(ecosystem, scanResultsByPath, options) {
+async function selectAndExecuteMonitorStrategy(ecosystem, scanResultsByPath, options, contributors) {
     return common_1.isUnmanagedEcosystem(ecosystem)
-        ? await resolve_monitor_facts_1.resolveAndMonitorFacts(scanResultsByPath, options)
+        ? await resolve_monitor_facts_1.resolveAndMonitorFacts(scanResultsByPath, options, contributors)
         : await monitorDependencies(scanResultsByPath, options);
 }
 async function generateMonitorDependenciesRequest(scanResult, options) {
@@ -880,7 +880,7 @@ const polling_monitor_1 = __webpack_require__(59354);
 const plugin_analytics_1 = __webpack_require__(33077);
 const errors_1 = __webpack_require__(55191);
 const common_1 = __webpack_require__(74434);
-async function resolveAndMonitorFacts(scans, options) {
+async function resolveAndMonitorFacts(scans, options, contributors) {
     const results = [];
     const errors = [];
     for (const [path, scanResults] of Object.entries(scans)) {
@@ -894,7 +894,7 @@ async function resolveAndMonitorFacts(scans, options) {
                 const resolutionMeta = common_1.extractResolutionMetaFromScanResult(scanResult);
                 const { maxAttempts, pollInterval } = res.pollingTask;
                 const attemptsCount = 0;
-                const response = await polling_monitor_1.pollingMonitorWithTokenUntilDone(res.token, true, options, pollInterval, attemptsCount, maxAttempts, resolutionMeta);
+                const response = await polling_monitor_1.pollingMonitorWithTokenUntilDone(res.token, true, options, pollInterval, attemptsCount, maxAttempts, resolutionMeta, contributors);
                 const ecosystemMonitorResult = {
                     ...response,
                     path,
@@ -2313,7 +2313,11 @@ function getIacDisplayedIssues(results, outputMeta) {
         .map((severity) => {
         const severityResults = formattedResults.results[severity];
         const titleOutput = color_utils_1.colors.severities[severity](`${capitalize(severity)} Severity Issues: ${severityResults.length}`);
-        const issuesOutput = severityResults.map(issue_1.formatIssue).join(os_1.EOL.repeat(2));
+        const issuesOutput = severityResults
+            .sort((severityResult1, severityResult2) => severityResult1.targetFile.localeCompare(severityResult2.targetFile) ||
+            severityResult1.issue.id.localeCompare(severityResult2.issue.id))
+            .map(issue_1.formatIssue)
+            .join(os_1.EOL.repeat(2));
         debug(`iac display output - ${severity} severity ${severityResults.length} issues`);
         return titleOutput + os_1.EOL.repeat(2) + issuesOutput;
     })
@@ -5765,7 +5769,7 @@ async function requestMonitorPollingToken(options, isAsync, scanResult) {
     return await promise_1.makeRequest(payload);
 }
 exports.requestMonitorPollingToken = requestMonitorPollingToken;
-async function pollingMonitorWithTokenUntilDone(token, isAsync, options, pollInterval, attemptsCount, maxAttempts = Infinity, resolutionMeta) {
+async function pollingMonitorWithTokenUntilDone(token, isAsync, options, pollInterval, attemptsCount, maxAttempts = Infinity, resolutionMeta, contributors = []) {
     const payload = {
         method: 'PUT',
         url: `${config_1.default.API}/monitor-dependencies/${token}`,
@@ -5778,6 +5782,7 @@ async function pollingMonitorWithTokenUntilDone(token, isAsync, options, pollInt
         body: {
             isAsync,
             resolutionMeta,
+            contributors,
             method: 'cli',
             tags: monitor_1.generateTags(options),
             attributes: monitor_1.generateProjectAttributes(options),
@@ -5789,7 +5794,7 @@ async function pollingMonitorWithTokenUntilDone(token, isAsync, options, pollInt
         return response;
     }
     await common_2.delayNextStep(attemptsCount, maxAttempts, pollInterval);
-    return await pollingMonitorWithTokenUntilDone(token, isAsync, options, pollInterval, attemptsCount, maxAttempts, resolutionMeta);
+    return await pollingMonitorWithTokenUntilDone(token, isAsync, options, pollInterval, attemptsCount, maxAttempts, resolutionMeta, contributors);
 }
 exports.pollingMonitorWithTokenUntilDone = pollingMonitorWithTokenUntilDone;