@contrast/contrast 2.3.1 → 2.4.0

package/dist/audit/auditRequests.js

@@ -50,13 +50,19 @@ const retrieveProjectByOrganizationIdUrl = (config) => {
         : baseUrl.concat(`&type=CLI`);
     return baseUrl;
 };
-export function registerProjectGroup(config, requestBody) {
+export async function registerProjectGroup(config, requestBody) {
     const options = buildBaseRequestOptions(config, ErrorType.GENERIC);
     options.url = registerProjectGroupUrl(config);
     options.json = requestBody;
     logDebug(config, 'registerProjectGroup');
     logDebug(config, `url ${options.url}`);
-    return got.post(options);
+    try {
+        return await got.post(options);
+    }
+    catch (e) {
+        console.log(`\nResource group ${config.resourceGroup} does not exist`);
+        process.exit(1);
+    }
 }
 const registerProjectGroupUrl = (config) => {
     return `${config.host}/api/v4/organizations/${config.organizationId}/project-groups`;

package/dist/audit/processAudit.js

@@ -4,12 +4,14 @@ import { processSca } from '../scaAnalysis/scaAnalysis.js';
 import { sendTelemetryConfigAsObject } from '../telemetry/telemetry.js';
 import { postRunMessage } from '../common/commonHelp.js';
 import { logInfo } from '../common/logging.js';
+import { validateHost } from '../utils/validationCheck.js';
 export const processAudit = async (contrastConf, argvMain) => {
     if (argvMain.indexOf('--help') !== -1) {
         printHelpMessage();
         process.exit(0);
     }
     let config = await getAuditConfig(contrastConf, 'audit', argvMain);
+    validateHost(config);
     await processSca(config);
     if (!config.fingerprint) {
         postRunMessage('audit');

package/dist/cliConstants.js

@@ -474,6 +474,14 @@ const auditOptionDefinitions = [
             '}:' +
             i18n.__('auditOptionsTrackSummary')
     },
+    {
+        name: 'resource-group',
+        type: String,
+        description: '{bold ' +
+            i18n.__('constantsOptional') +
+            '}:' +
+            i18n.__('auditOptionsResourceGroupSummary')
+    },
     {
         name: 'branch',
         description: '{bold ' +
@@ -561,7 +569,6 @@ const mainUsageGuide = commandLineUsage([
             { name: i18n.__('lambdaName'), summary: i18n.__('helpLambdaSummary') },
             { name: i18n.__('helpName'), summary: i18n.__('helpSummary') },
             { name: i18n.__('learnName'), summary: i18n.__('helpLearnSummary') },
-            { name: i18n.__('sarifName'), summary: i18n.__('sarifSummary') },
             {
                 name: i18n.__('configGenerate'),
                 summary: i18n.__('configGenerateSummary')

package/dist/constants/constants.js

@@ -17,7 +17,7 @@ export const HIGH = 'HIGH';
 export const CRITICAL = 'CRITICAL';
 // App
 export const APP_NAME = 'contrast';
-const APP_VERSION = '2.3.1';
+const APP_VERSION = '2.4.0';
 export const TIMEOUT = 120000;
 export const CRITICAL_PRIORITY = 1;
 export const HIGH_PRIORITY = 2;

package/dist/constants/locales.js

@@ -148,6 +148,7 @@ export const en_locales = () => {
         scanOptionsFileNameSummary: 'Path of the file you want to scan. If no file is specified, Contrast searches for a .jar, .war, .exe or .zip file in the working directory.',
         scanOptionsVerboseSummary: ' Returns extended information to the terminal.',
         auditOptionsTrackSummary: ' Send your dependency audit to Contrast to see results in the UI and start automating security checks. For instance when running local SCA checks you may not need or want to track the results.',
+        auditOptionsResourceGroupSummary: ' Add permissions for a new project to selected resource group.',
         auditOptionsBranchSummary: ' Set the branch name to associate the library results to.',
         auditOptionsLegacySummary: ' Creates an application in Contrast (a legacy workflow) - displays a dependency tree for your piece of code, utilizes metadata.' +
             '\n' +

package/dist/github/projectGroup.js

@@ -27,6 +27,9 @@ export const buildNewProjectGroupBody = async (config) => {
         body.type = 'CLI';
         body.name = getProjectGroupNameCLI(config);
     }
+    if (config.resourceGroup) {
+        body.resourceGroups = [config.resourceGroup];
+    }
     return body;
 };
 const getProjectGroupNameRepo = config => {

package/dist/index.js

@@ -31,6 +31,7 @@ const getMainOption = () => {
     };
 };
 const start = async () => {
+    // testing changes
     try {
         if (await isCorrectNodeVersion(process.version)) {
             const { mainOptions, argv: argvMain } = getMainOption();

package/dist/scaAnalysis/common/commonReportingFunctionsSca.js

@@ -25,14 +25,19 @@ export const printFormattedOutputSca = (config, reportModelList, numberOfVulnera
     const report = new ReportList();
     for (const library of reportModelList) {
         const { artifactName, version, vulnerabilities, remediationAdvice } = library;
-        const highestSeverity = findHighestSeverityCVESca(vulnerabilities, config);
-        const severityCount = severityCountAllCVEsSca(vulnerabilities, new SeverityCountModel()).getTotal;
-        if (highestSeverity.priority === undefined) {
-            highestSeverity.priority = NOTE_PRIORITY;
-            logDebug(config, `Unknown severity for vulnerability ${artifactName}`);
+        if (vulnerabilities.length === 0) {
+            logDebug(config, `Unable to find vulnerability for ${artifactName} version ${version}`);
+        }
+        else {
+            const highestSeverity = findHighestSeverityCVESca(vulnerabilities, config);
+            const severityCount = severityCountAllCVEsSca(vulnerabilities, new SeverityCountModel()).getTotal;
+            if (highestSeverity.priority === undefined) {
+                highestSeverity.priority = NOTE_PRIORITY;
+                logDebug(config, `Unknown severity for vulnerability ${artifactName}`);
+            }
+            const newOutputModel = new ReportModelStructure(new ReportCompositeKey(artifactName, version, highestSeverity, severityCount), vulnerabilities, remediationAdvice);
+            report.reportOutputList.push(newOutputModel);
         }
-        const newOutputModel = new ReportModelStructure(new ReportCompositeKey(artifactName, version, highestSeverity, severityCount), vulnerabilities, remediationAdvice);
-        report.reportOutputList.push(newOutputModel);
     }
     const outputOrderedByLowestSeverityAndLowestNumOfCvesFirst = orderBy(report.reportOutputList, [
         reportListItem => {

package/dist/scaAnalysis/processServicesFlow.js

@@ -88,6 +88,12 @@ const trackProcess = async (analysis, config, reportSpinner) => {
     if (projectId === '') {
         return dealWithNoProjectId(analysis, config, reportSpinner);
     }
+    else if (config.resourceGroup) {
+        console.log('\nProject ' +
+            projectId +
+            ' already exists and will not be added to resource group ' +
+            config.resourceGroup);
+    }
     config.projectId = projectId;
     // we can always register just in case but normally we exit when
     await registerProjectIdOnCliServices(config, projectId);

package/dist/scan/processScan.js

@@ -7,8 +7,10 @@ import { sendTelemetryConfigAsObject } from '../telemetry/telemetry.js';
 import { processFail } from '../common/fail.js';
 import { postRunMessage } from '../common/commonHelp.js';
 import { logInfo } from '../common/logging.js';
+import { validateHost } from '../utils/validationCheck.js';
 export const processScan = async (contrastConf, argv) => {
     let config = await scanConfig.getScanConfig(contrastConf, 'scan', argv);
+    validateHost(config);
     let output = undefined;
     const scanResults = new ScanResultsModel(await startScan(config));
     await sendTelemetryConfigAsObject(config, 'scan', argv, 'SUCCESS', scanResults.scanDetail.language);

package/dist/utils/validationCheck.js

@@ -18,6 +18,11 @@ export const validateAuthParams = params => {
         params.host &&
         params.authorization);
 };
+export const validateHost = config => {
+    if (config.host.endsWith('/')) {
+        config.host = config.host.slice(0, -1);
+    }
+};
 export const validateFingerprintParams = params => {
     return !!(params.repositoryUrl && params.repositoryName);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/contrast",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Contrast Security's command line tool",
   "exports": "./dist/index.js",
   "type": "module",