@contrast/contrast 2.0.2-beta.1 → 2.0.2-beta.11

package/dist/lambda/scanRequest.js

@@ -1,31 +1,25 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFunctionEvent = exports.requestScanFunctionPost = exports.sendScanPostRequest = void 0;
-const i18n_1 = __importDefault(require("i18n"));
-const log_symbols_1 = __importDefault(require("log-symbols"));
-const chalk_1 = __importDefault(require("chalk"));
-const arn_1 = require("./arn");
-const aws_1 = require("./aws");
-const utils_1 = require("./utils");
-const commonApi_1 = require("../utils/commonApi");
-const logUtils_1 = require("./logUtils");
-const cliError_1 = require("./cliError");
-const constants_1 = require("./constants");
-const requestUtils_1 = require("../utils/requestUtils");
+import i18n from 'i18n';
+import logSymbols from 'log-symbols';
+import chalk from 'chalk';
+import { parseARN } from './arn.js';
+import { getLambdaClient, getLambdaFunctionConfiguration, getLambdaPolicies, getLayersLinks } from './aws.js';
+import { toLowerKeys } from './utils.js';
+import { getHttpClient } from '../utils/commonApi.js';
+import { log, prettyPrintJson } from './logUtils.js';
+import { CliError } from './cliError.js';
+import { ERRORS } from './constants.js';
+import { sleep } from '../utils/requestUtils.js';
 const MAX_RETRIES = 2;
 const sendScanPostRequest = async (config, params, functionsEvent, showProgress = false, retryNumber = 0) => {
-    const client = (0, commonApi_1.getHttpClient)(config);
+    const client = getHttpClient(config);
     if (showProgress) {
-        (0, logUtils_1.log)(i18n_1.default.__('sendingScanRequest', { icon: log_symbols_1.default.success }));
+        log(i18n.__('sendingScanRequest', { icon: logSymbols.success }));
     }
-    const res = await client.postFunctionScan(config, params, functionsEvent);
+    const res = (await client.postFunctionScan(config, params, functionsEvent));
     const { statusCode, body } = res;
     if (statusCode === 201) {
         if (showProgress) {
-            (0, logUtils_1.log)(i18n_1.default.__('scanRequestedSuccessfully', { icon: log_symbols_1.default.success }));
+            log(i18n.__('scanRequestedSuccessfully', { icon: logSymbols.success }));
         }
         return body?.data?.scanId;
     }
@@ -34,33 +28,32 @@ const sendScanPostRequest = async (config, params, functionsEvent, showProgress
     let description = '';
     switch (errorCode) {
         case 'not_supported_runtime':
-            description = i18n_1.default.__(errorCode, {
+            description = i18n.__(errorCode, {
                 runtime: data?.runtime,
                 supportedRuntimes: data?.supportedRuntimes.sort().join(' | ')
             });
             errorCode = false;
             break;
         case 'not_supported_lambda':
-            description = i18n_1.default.__(errorCode);
+            description = i18n.__(errorCode);
             errorCode = false;
             break;
         default:
             if (retryNumber < MAX_RETRIES) {
-                await (0, requestUtils_1.sleep)(3 * 1000);
+                await sleep(3 * 1000);
                 return sendScanPostRequest(config, params, functionsEvent, showProgress, retryNumber + 1);
             }
     }
-    throw new cliError_1.CliError(constants_1.ERRORS.FAILED_TO_START_SCAN, {
+    throw new CliError(ERRORS.FAILED_TO_START_SCAN, {
         statusCode,
         errorCode,
         data,
         description
     });
 };
-exports.sendScanPostRequest = sendScanPostRequest;
 const createFunctionEvent = (lambdaConfig, layersLinks, lambdaPolicies) => {
     delete lambdaConfig.$metadata;
-    const functionEvent = (0, utils_1.toLowerKeys)(lambdaConfig.Configuration);
+    const functionEvent = toLowerKeys(lambdaConfig.Configuration);
     functionEvent['code'] = lambdaConfig.Code;
     functionEvent['rolePolicies'] = lambdaPolicies;
     if (layersLinks) {
@@ -68,43 +61,43 @@ const createFunctionEvent = (lambdaConfig, layersLinks, lambdaPolicies) => {
     }
     return { function: functionEvent };
 };
-exports.createFunctionEvent = createFunctionEvent;
 const requestScanFunctionPost = async (config, lambdaOptions) => {
     const { verbose, jsonOutput, functionName } = lambdaOptions;
-    const lambdaClient = (0, aws_1.getLambdaClient)(lambdaOptions);
+    const lambdaClient = getLambdaClient(lambdaOptions);
     if (!jsonOutput) {
-        (0, logUtils_1.log)(i18n_1.default.__('fetchingConfiguration', {
-            icon: log_symbols_1.default.success,
-            functionName: chalk_1.default.bold(functionName)
+        log(i18n.__('fetchingConfiguration', {
+            icon: logSymbols.success,
+            functionName: chalk.bold(functionName)
         }));
     }
-    const lambdaConfig = await (0, aws_1.getLambdaFunctionConfiguration)(lambdaClient, lambdaOptions);
+    const lambdaConfig = await getLambdaFunctionConfiguration(lambdaClient, lambdaOptions);
     if (!lambdaConfig?.Configuration) {
-        throw new cliError_1.CliError(constants_1.ERRORS.FAILED_TO_START_SCAN, {
+        throw new CliError(ERRORS.FAILED_TO_START_SCAN, {
             errorCode: 'missingLambdaConfig'
         });
     }
     const { Configuration } = lambdaConfig;
-    const layersLinks = await (0, aws_1.getLayersLinks)(lambdaClient, Configuration);
-    const lambdaPolicies = await (0, aws_1.getLambdaPolicies)(Configuration, lambdaOptions);
+    const layersLinks = await getLayersLinks(lambdaClient, Configuration);
+    const lambdaPolicies = await getLambdaPolicies(Configuration, lambdaOptions);
     const functionEvent = createFunctionEvent(lambdaConfig, layersLinks, lambdaPolicies);
     const { FunctionArn: functionArn } = Configuration;
     if (!functionArn) {
-        throw new cliError_1.CliError(constants_1.ERRORS.FAILED_TO_START_SCAN, {
+        throw new CliError(ERRORS.FAILED_TO_START_SCAN, {
             errorCode: 'missingLambdaArn'
         });
     }
-    const parsedARN = (0, arn_1.parseARN)(functionArn);
+    const parsedARN = parseARN(functionArn);
     const params = {
         organizationId: config.organizationId,
         provider: 'aws',
         accountId: parsedARN.accountId
     };
     if (verbose) {
-        (0, logUtils_1.log)(i18n_1.default.__('fetchedConfiguration', { icon: log_symbols_1.default.success }));
-        (0, logUtils_1.prettyPrintJson)(functionEvent);
+        log(i18n.__('fetchedConfiguration', { icon: logSymbols.success }));
+        prettyPrintJson(functionEvent);
     }
     const scanId = await sendScanPostRequest(config, params, functionEvent, !jsonOutput);
     return { scanId, params, functionArn };
 };
-exports.requestScanFunctionPost = requestScanFunctionPost;
+export { sendScanPostRequest, requestScanFunctionPost, createFunctionEvent };
+//# sourceMappingURL=scanRequest.js.map

package/dist/lambda/scanRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanRequest.js","sourceRoot":"","sources":["../../src/lambda/scanRequest.ts"],"names":[],"mappings":"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"}

package/dist/lambda/scanResults.js

@@ -1,16 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScanResults = void 0;
-const commonApi_1 = require("../utils/commonApi");
-const cliError_1 = require("./cliError");
-const constants_1 = require("./constants");
+import { getHttpClient } from '../utils/commonApi.js';
+import { CliError } from './cliError.js';
+import { ERRORS } from './constants.js';
 const getScanResults = async (config, params, scanId, functionArn) => {
-    const client = (0, commonApi_1.getHttpClient)(config);
-    const { statusCode, body } = await client.getFunctionScanResults(config, params, scanId, functionArn);
+    const client = getHttpClient(config);
+    const { statusCode, body } = (await client.getFunctionScanResults(config, params, scanId, functionArn));
     if (statusCode === 200) {
         return body;
     }
     const { errorCode } = body || {};
-    throw new cliError_1.CliError(constants_1.ERRORS.FAILED_TO_GET_RESULTS, { statusCode, errorCode });
+    throw new CliError(ERRORS.FAILED_TO_GET_RESULTS, { statusCode, errorCode });
 };
-exports.getScanResults = getScanResults;
+export { getScanResults };
+//# sourceMappingURL=scanResults.js.map

package/dist/lambda/scanResults.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanResults.js","sourceRoot":"","sources":["../../src/lambda/scanResults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAGvC,MAAM,cAAc,GAAG,KAAK,EAC1B,MAAW,EACX,MAAiB,EACjB,MAAc,EACd,WAAmB,EACnB,EAAE;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IAEpC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,sBAAsB,CAC/D,MAAM,EACN,MAAM,EACN,MAAM,EACN,WAAW,CACZ,CAAQ,CAAA;IAET,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,CAAA;IAChC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,qBAAqB,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;AAC7E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/dist/lambda/types.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventType = exports.StatusType = void 0;
-var StatusType;
+export var StatusType;
 (function (StatusType) {
     StatusType["FAILED"] = "failed";
     StatusType["SUCCESS"] = "success";
-})(StatusType = exports.StatusType || (exports.StatusType = {}));
-var EventType;
+})(StatusType || (StatusType = {}));
+export var EventType;
 (function (EventType) {
     EventType["START"] = "start_command_session";
     EventType["END"] = "end_command_session";
-})(EventType = exports.EventType || (exports.EventType = {}));
+})(EventType || (EventType = {}));
+//# sourceMappingURL=types.js.map

package/dist/lambda/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/lambda/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;AACrB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,4CAA+B,CAAA;IAC/B,wCAA2B,CAAA;AAC7B,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB"}

package/dist/lambda/utils.js

@@ -1,14 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportedForTesting = exports.printResults = exports.toLowerKeys = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const lodash_1 = require("lodash");
-const i18n_1 = __importDefault(require("i18n"));
-const logUtils_1 = require("./logUtils");
-i18n_1.default.setLocale('en');
+import chalk from 'chalk';
+import { groupBy, sortBy, capitalize, minBy } from 'lodash-es';
+import i18n from 'i18n';
+import { log } from './logUtils.js';
+// fix for using `plural`
+// https://github.com/mashpie/i18n-node/issues/429
+i18n.setLocale('en');
 class PrintVulnerability {
     constructor(index, vulnerability, group) {
         const { severityText, title, description, remediation, categoryText } = vulnerability;
@@ -16,7 +12,7 @@ class PrintVulnerability {
         this.vulnerability = vulnerability;
         this.index = index;
         this.title = title;
-        this.severity = (0, lodash_1.capitalize)(severityText);
+        this.severity = capitalize(severityText);
         this.description = underlineLinks(description);
         this.remediation = remediation?.description;
         this.recommendation = '';
@@ -52,13 +48,13 @@ class PrintVulnerability {
                 const [policy, description] = comment.split(':').map(c => c.trim());
                 return { policy, description };
             };
-            const groupByPolicy = (0, lodash_1.groupBy)(comment, c => splitComment(c).policy);
+            const groupByPolicy = groupBy(comment, c => splitComment(c).policy);
             Object.entries(groupByPolicy).forEach(([policy, commentArr]) => {
                 const comments = commentArr
                     .map(splitComment)
                     .map(({ description }) => ` - ${description}`)
                     .join('\n');
-                this.whatHappened += i18n_1.default.__('whatHappenedItem', { policy, comments });
+                this.whatHappened += i18n.__('whatHappenedItem', { policy, comments });
             });
         }
     }
@@ -67,14 +63,14 @@ class PrintVulnerability {
             this.recommendation = this.vulnerability?.remediation?.description;
             return;
         }
-        const maxSeverity = (0, lodash_1.minBy)(this.group, 'severity');
-        this.title = i18n_1.default.__('vulnerableDependency');
-        this.severity = (0, lodash_1.capitalize)(maxSeverity.severityText);
+        const maxSeverity = minBy(this.group, 'severity');
+        this.title = i18n.__('vulnerableDependency');
+        this.severity = capitalize(maxSeverity.severityText);
         this.recommendation = maxSeverity.remediation?.description;
         const library = groupByDependency({ title: this.vulnerability.title });
         const [packageName, version] = library.split(':');
         const allCves = this.group.map(groupByCVE);
-        this.description = i18n_1.default.__mf('vulnerableDependencyDescriptions', {
+        this.description = i18n.__mf('vulnerableDependencyDescriptions', {
             NUM: this.group.length,
             packageName,
             version,
@@ -82,26 +78,28 @@ class PrintVulnerability {
         });
     }
     print() {
-        (0, logUtils_1.log)(`${this.index}.`);
-        (0, logUtils_1.log)(`${chalk_1.default.bold(this.severity)} | ${chalk_1.default.bold(this.title)} ${this.description}`);
+        log(`${this.index}.`);
+        // prettier-ignore
+        log(`${chalk.bold(this.severity)} | ${chalk.bold(this.title)} ${this.description}`);
         if (this.whatHappened) {
-            (0, logUtils_1.log)(`\n${chalk_1.default.bold(i18n_1.default.__('whatHappenedTitle'))}\n${this.whatHappened}`);
+            log(`\n${chalk.bold(i18n.__('whatHappenedTitle'))}\n${this.whatHappened}`);
         }
         if (this.recommendation) {
-            (0, logUtils_1.log)(`${chalk_1.default.bold(i18n_1.default.__('recommendation'))}\n${this.recommendation}`);
+            log(`${chalk.bold(i18n.__('recommendation'))}\n${this.recommendation}`);
         }
-        (0, logUtils_1.log)('');
+        log('');
     }
 }
 const groupByCVE = ({ title }) => title.substring(0, title.indexOf('[') - 1);
 const groupByDependency = ({ title }) => title.substring(title.indexOf('[') + 1, title.indexOf(']'));
 const printResults = (results) => {
+    //filter out any vulnerabs which is not least privilege or dependencies- cli does not handle other vulnerabs yet
     const vulnerabs = results.filter(r => r.category === 1 || r.category === 4);
-    const sortBySeverity = (0, lodash_1.sortBy)(vulnerabs, ['severity', 'title']);
+    const sortBySeverity = sortBy(vulnerabs, ['severity', 'title']);
     const notDependencies = sortBySeverity.filter(r => r.category !== 1);
     const dependencies = sortBySeverity.filter(r => r.category === 1);
-    const dependenciesByLibrary = (0, lodash_1.groupBy)(dependencies, groupByDependency);
-    (0, logUtils_1.log)('');
+    const dependenciesByLibrary = groupBy(dependencies, groupByDependency);
+    log('');
     notDependencies.forEach((vulnerability, index) => {
         const printVulnerab = new PrintVulnerability(index + 1, vulnerability);
         printVulnerab.print();
@@ -113,24 +111,23 @@ const printResults = (results) => {
     });
     const dependenciesCount = Object.keys(dependenciesByLibrary).length;
     const resultCount = notDependencies.length + dependenciesCount;
-    (0, logUtils_1.log)(i18n_1.default.__n('foundVulnerabilities', resultCount), { bold: true });
+    log(i18n.__n('foundVulnerabilities', resultCount), { bold: true });
     const counters = getNotDependenciesCounters(notDependencies);
     if (dependenciesCount) {
-        counters.push(i18n_1.default.__n('dependenciesCount', dependenciesCount));
+        counters.push(i18n.__n('dependenciesCount', dependenciesCount));
     }
-    (0, logUtils_1.log)(counters.join(' | '), { bold: true });
+    log(counters.join(' | '), { bold: true });
 };
-exports.printResults = printResults;
 const getNotDependenciesCounters = (notDependencies) => {
-    const groupByType = (0, lodash_1.groupBy)(notDependencies, ['categoryText']);
-    return Object.values(groupByType).map(group => `${group.length} ${(0, lodash_1.capitalize)(group[0].categoryText)}`);
+    const groupByType = groupBy(notDependencies, ['categoryText']);
+    return Object.values(groupByType).map(group => `${group.length} ${capitalize(group[0].categoryText)}`);
 };
 const underlineLinks = (text) => {
     if (!text) {
         return text;
     }
     const urlRegex = /(https?:\/\/[^\s]+)/g;
-    return text.replace(urlRegex, chalk_1.default.underline('$1'));
+    return text.replace(urlRegex, chalk.underline('$1'));
 };
 function toLowerKeys(obj) {
     return Object.keys(obj).reduce((accumulator, key) => {
@@ -139,9 +136,10 @@ function toLowerKeys(obj) {
         return accumulator;
     }, {});
 }
-exports.toLowerKeys = toLowerKeys;
-exports.exportedForTesting = {
+export { toLowerKeys, printResults };
+export const exportedForTesting = {
     underlineLinks,
     printResults,
     PrintVulnerability
 };
+//# sourceMappingURL=utils.js.map

package/dist/lambda/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lambda/utils.ts"],"names":[],"mappings":"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"}

package/dist/sbom/generateSbom.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSCASbom = exports.generateSbom = void 0;
-const commonApi_1 = require("../utils/commonApi");
-const generateSbom = (config, type) => {
-    const client = (0, commonApi_1.getHttpClient)(config);
+import { getHttpClient } from '../utils/commonApi.js';
+export const generateSbom = (config, type) => {
+    const client = getHttpClient(config);
     return client
         .getSbom(config, type)
         .then((res) => {
@@ -24,9 +21,8 @@ const generateSbom = (config, type) => {
         console.log(err);
     });
 };
-exports.generateSbom = generateSbom;
-const generateSCASbom = (config, type, reportId) => {
-    const client = (0, commonApi_1.getHttpClient)(config);
+export const generateSCASbom = (config, type, reportId) => {
+    const client = getHttpClient(config);
     return client
         .getSCASbom(config, type, reportId)
         .then((res) => {
@@ -42,4 +38,4 @@ const generateSCASbom = (config, type, reportId) => {
         console.log(err);
     });
 };
-exports.generateSCASbom = generateSCASbom;
+//# sourceMappingURL=generateSbom.js.map

package/dist/sbom/generateSbom.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateSbom.js","sourceRoot":"","sources":["../../src/sbom/generateSbom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAW,EAAE,IAAY,EAAE,EAAE;IACxD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,OAAO,MAAM;SACV,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;SACrB,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;QACjB,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;YAC1B,OAAO,GAAG,CAAC,IAAI,CAAA;SAChB;aAAM,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAA;YACrE,OAAO,CAAC,GAAG,CACT,+DAA+D,MAAM,CAAC,cAAc,YAAY,MAAM,CAAC,aAAa,EAAE,CACvH,CAAA;YACD,OAAO,SAAS,CAAA;SACjB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAA;YACnE,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAW,EACX,IAAY,EACZ,QAAgB,EAChB,EAAE;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,OAAO,MAAM;SACV,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC;SAClC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;QACjB,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;YAC1B,OAAO,GAAG,CAAC,IAAI,CAAA;SAChB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAA;YACnE,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}

package/dist/scaAnalysis/common/auditReport.js

@@ -1,9 +1,9 @@
-"use strict";
-const { getSeverityCounts, printNoVulnFoundMsg } = require('../../audit/report/commonReportingFunctions');
-const common = require('../../common/fail');
-const { printFormattedOutputSca } = require('./commonReportingFunctionsSca');
-const { auditSave } = require('../../audit/save');
-const processAuditReport = async (config, reportModelList, reportId) => {
+import { auditSave } from '../../audit/save.js';
+import { processFail } from '../../common/fail.js';
+import { getSeverityCounts, printNoVulnFoundMsg } from '../../audit/report/commonReportingFunctions.js';
+import { printFormattedOutputSca } from './commonReportingFunctionsSca.js';
+import { logInfo } from '../../common/logging.js';
+export const processAuditReport = async (config, reportModelList, reportId) => {
     let severityCounts = {};
     if (reportModelList !== undefined) {
         severityCounts = formatScaServicesReport(config, reportModelList);
@@ -12,13 +12,13 @@ const processAuditReport = async (config, reportModelList, reportId) => {
         await auditSave(config, reportId);
     }
     else {
-        console.log('Use contrast audit --save to generate an SBOM');
+        logInfo('Use contrast audit --save to generate an SBOM');
     }
     if (config.fail) {
-        common.processFail(config, severityCounts);
+        processFail(config, severityCounts);
     }
 };
-const formatScaServicesReport = (config, reportModelList) => {
+export const formatScaServicesReport = (config, reportModelList) => {
     const projectOverviewCount = getSeverityCounts(reportModelList);
     if (projectOverviewCount.total === 0) {
         printNoVulnFoundMsg();
@@ -36,7 +36,4 @@ const formatScaServicesReport = (config, reportModelList) => {
     }
     return projectOverviewCount;
 };
-module.exports = {
-    formatScaServicesReport,
-    processAuditReport
-};
+//# sourceMappingURL=auditReport.js.map

package/dist/scaAnalysis/common/auditReport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auditReport.js","sourceRoot":"","sources":["../../../src/scaAnalysis/common/auditReport.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAEjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE;IAC5E,IAAI,cAAc,GAAG,EAAE,CAAA;IACvB,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,cAAc,GAAG,uBAAuB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAClE;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;KAClC;SAAM;QACL,OAAO,CAAC,+CAA+C,CAAC,CAAA;KACzD;IAED,IAAI,MAAM,CAAC,IAAI,EAAE;QACf,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;KACpC;AACH,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE;IACjE,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAA;IAE/D,IAAI,oBAAoB,CAAC,KAAK,KAAK,CAAC,EAAE;QACpC,mBAAmB,EAAE,CAAA;KACtB;SAAM;QACL,MAAM,2BAA2B,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChE,IAAI,KAAK,GAAG,CAAC,CAAA;YAEb,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,KAAK,EAAE,CAAA;aACR;YAED,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAC,MAAM,CAAA;QAET,IAAI,YAAY,GAAG,eAAe,CAAC,MAAM,CACvC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,EAC1D,CAAC,CACF,CAAA;QAED,uBAAuB,CACrB,MAAM,EACN,eAAe,EACf,2BAA2B,EAC3B,YAAY,CACb,CAAA;KACF;IAED,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA"}

package/dist/scaAnalysis/common/commonReportingFunctionsSca.js

@@ -1,27 +1,27 @@
-"use strict";
-const { ReportList, ReportModelStructure, ReportCompositeKey } = require('../../audit/report/models/reportListModel');
-const { countVulnerableLibrariesBySeverity } = require('../../audit/report/utils/reportUtils');
-const { SeverityCountModel } = require('../../audit/report/models/severityCountModel');
-const { orderBy } = require('lodash');
-const { ReportOutputModel, ReportOutputHeaderModel, ReportOutputBodyModel } = require('../../audit/report/models/reportOutputModel');
-const { CE_URL, CRITICAL_COLOUR, HIGH_COLOUR, MEDIUM_COLOUR, LOW_COLOUR, NOTE_COLOUR } = require('../../constants/constants');
-const chalk = require('chalk');
-const Table = require('cli-table3');
-const { findHighestSeverityCVESca, severityCountAllCVEsSca, findCVESeveritySca, orderByHighestPrioritySca } = require('./utils/reportUtilsSca');
-const { buildFormattedHeaderNum } = require('../../audit/report/commonReportingFunctions');
-const createSummaryMessageTop = (numberOfVulnerableLibraries, numberOfCves) => {
+import { ReportList, ReportModelStructure, ReportCompositeKey } from '../../audit/report/models/reportListModel.js';
+import { countVulnerableLibrariesBySeverity } from '../../audit/report/utils/reportUtils.js';
+import { SeverityCountModel } from '../../audit/report/models/severityCountModel.js';
+import { orderBy } from 'lodash-es';
+import { ReportOutputModel, ReportOutputHeaderModel, ReportOutputBodyModel } from '../../audit/report/models/reportOutputModel.js';
+import { CE_URL, CRITICAL_COLOUR, HIGH_COLOUR, MEDIUM_COLOUR, LOW_COLOUR, NOTE_COLOUR } from '../../constants/constants.js';
+import Table from 'cli-table3';
+import { findHighestSeverityCVESca, severityCountAllCVEsSca, findCVESeveritySca, orderByHighestPrioritySca } from './utils/reportUtilsSca.js';
+import chalk from 'chalk';
+import { buildFormattedHeaderNum } from '../../audit/report/commonReportingFunctions.js';
+import { logInfo } from '../../common/logging.js';
+export const createSummaryMessageTop = (numberOfVulnerableLibraries, numberOfCves) => {
     numberOfVulnerableLibraries === 1
-        ? console.log(`\n\nFound 1 vulnerable library containing ${numberOfCves} CVE`)
-        : console.log(`\n\nFound ${numberOfVulnerableLibraries} vulnerable libraries containing ${numberOfCves} CVEs`);
+        ? logInfo(`\n\nFound 1 vulnerable library containing ${numberOfCves} CVE`)
+        : logInfo(`\n\nFound ${numberOfVulnerableLibraries} vulnerable libraries containing ${numberOfCves} CVEs`);
 };
-const createSummaryMessageBottom = numberOfVulnerableLibraries => {
+export const createSummaryMessageBottom = numberOfVulnerableLibraries => {
     numberOfVulnerableLibraries === 1
-        ? console.log(`Found 1 vulnerability`)
-        : console.log(`Found ${numberOfVulnerableLibraries} vulnerabilities`);
+        ? logInfo(`Found 1 vulnerability`)
+        : logInfo(`Found ${numberOfVulnerableLibraries} vulnerabilities`);
 };
-const printFormattedOutputSca = (config, reportModelList, numberOfVulnerableLibraries, numberOfCves) => {
+export const printFormattedOutputSca = (config, reportModelList, numberOfVulnerableLibraries, numberOfCves) => {
     createSummaryMessageTop(numberOfVulnerableLibraries, numberOfCves);
-    console.log();
+    logInfo('');
     const report = new ReportList();
     for (const library of reportModelList) {
         const { artifactName, version, vulnerabilities, remediationAdvice } = library;
@@ -47,18 +47,23 @@ const printFormattedOutputSca = (config, reportModelList, numberOfVulnerableLibr
         const body = buildBody(cveArray, remediationAdvice);
         const reportOutputModel = new ReportOutputModel(header, body);
         table.push(reportOutputModel.body.issueMessage, reportOutputModel.body.adviceMessage);
-        console.log(reportOutputModel.header.vulnMessage, reportOutputModel.header.introducesMessage);
-        console.log(table.toString() + '\n');
+        logInfo(`${reportOutputModel.header.vulnMessage} ${reportOutputModel.header.introducesMessage}`);
+        logInfo(`${table.toString()} \n`);
     }
     createSummaryMessageBottom(numberOfVulnerableLibraries);
     const { criticalMessage, highMessage, mediumMessage, lowMessage, noteMessage } = buildFooter(outputOrderedByLowestSeverityAndLowestNumOfCvesFirst);
-    console.log(`${criticalMessage} | ${highMessage} | ${mediumMessage} | ${lowMessage} | ${noteMessage}`);
+    logInfo(`${criticalMessage} | ${highMessage} | ${mediumMessage} | ${lowMessage} | ${noteMessage}`);
     if (config.host !== CE_URL && config.projectId) {
-        console.log('\n' + chalk.bold("Check out your project's results in Contrast"));
-        console.log(`${config.host}/Contrast/static/ng/index.html#/${config.organizationId}/libraries?view=static&projects=${config.name}`);
+        logInfo('\n' + chalk.bold('Check out your project’s SCA risk in Contrast.'));
+        if (config.repo && config.shortenedFilePath) {
+            logInfo(`${config.host}/Contrast/static/ng/index.html#/${config.organizationId}/libraries?view=static&projects=${config.shortenedFilePath}`);
+        }
+        else {
+            logInfo(`${config.host}/Contrast/static/ng/index.html#/${config.organizationId}/libraries?view=static&projects=${config.name}`);
+        }
     }
 };
-function getReportTable() {
+export function getReportTable() {
     return new Table({
         chars: {
             top: '',
@@ -83,7 +88,7 @@ function getReportTable() {
         colWidths: [12, 1, 100]
     });
 }
-function buildHeader(highestSeverity, contrastHeaderNum, libraryName, version, numOfCVEs) {
+export function buildHeader(highestSeverity, contrastHeaderNum, libraryName, version, numOfCVEs) {
     const vulnerabilityPluralised = numOfCVEs > 1 ? 'vulnerabilities' : 'vulnerability';
     const formattedHeaderNum = buildFormattedHeaderNum(contrastHeaderNum);
     const headerColour = chalk.hex(highestSeverity.colour);
@@ -93,13 +98,13 @@ function buildHeader(highestSeverity, contrastHeaderNum, libraryName, version, n
     const introducesMessage = `introduces ${numOfCVEs} ${vulnerabilityPluralised}`;
     return new ReportOutputHeaderModel(vulnMessage, introducesMessage);
 }
-function buildBody(cveArray, advice) {
+export function buildBody(cveArray, advice) {
     const orderedCvesWithSeverityAssigned = orderByHighestPrioritySca(cveArray.map(cve => findCVESeveritySca(cve)));
     const issueMessage = getIssueRow(orderedCvesWithSeverityAssigned);
     const adviceMessage = getAdviceRow(advice);
     return new ReportOutputBodyModel(issueMessage, adviceMessage);
 }
-function getIssueRow(cveArray) {
+export function getIssueRow(cveArray) {
     const cveMessagesList = getIssueCveMsgList(cveArray);
     return [chalk.bold('Issue'), ':', `${cveMessagesList.join(', ')}`];
 }
@@ -129,7 +134,7 @@ const buildFooter = reportModelStructure => {
         noteMessage
     };
 };
-const getIssueCveMsgList = reportSeverityModels => {
+export const getIssueCveMsgList = reportSeverityModels => {
     const cveMessages = [];
     reportSeverityModels.forEach(reportSeverityModel => {
         const { colour, severity, name } = reportSeverityModel;
@@ -141,14 +146,4 @@ const getIssueCveMsgList = reportSeverityModels => {
     });
     return cveMessages;
 };
-module.exports = {
-    createSummaryMessageTop,
-    createSummaryMessageBottom,
-    printFormattedOutputSca,
-    getReportTable,
-    buildHeader,
-    buildBody,
-    getIssueRow,
-    buildFormattedHeaderNum,
-    getIssueCveMsgList
-};
+//# sourceMappingURL=commonReportingFunctionsSca.js.map

package/dist/scaAnalysis/common/commonReportingFunctionsSca.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commonReportingFunctionsSca.js","sourceRoot":"","sources":["../../../src/scaAnalysis/common/commonReportingFunctionsSca.js"],"names":[],"mappings":"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"}