diff --git a/src/main/scanLogic/scanRunners/applicabilityScan.ts b/src/main/scanLogic/scanRunners/applicabilityScan.ts index 16d043b7..37160fed 100644 --- a/src/main/scanLogic/scanRunners/applicabilityScan.ts +++ b/src/main/scanLogic/scanRunners/applicabilityScan.ts @@ -52,7 +52,7 @@ export interface ApplicabilityScanResponse { // All the cve that have applicable issues applicableCve: { [cve_id: string]: CveApplicableDetails }; // All the cve that have non-applicable issues - nonapplicableCve: { [cve_id: string]: CveApplicableDetails }; + notApplicableCve: { [cve_id: string]: CveApplicableDetails }; } /** @@ -269,11 +269,11 @@ export class ApplicabilityRunner extends JasRunner { Object.entries(scanResponse.applicableCve) ); let notApplicableCvesIdToDetails: Map = new Map( - Object.entries(scanResponse.nonapplicableCve) + Object.entries(scanResponse.notApplicableCve) ); let relevantScannedCve: string[] = []; let relevantApplicableCve: Map = new Map(); - let relevantNonApplicableCve: Map = new Map(); + let relevantNotApplicableCve: Map = new Map(); for (let scannedCve of scanResponse.scannedCve) { if (relevantCve.has(scannedCve)) { @@ -285,14 +285,14 @@ export class ApplicabilityRunner extends JasRunner { } potential = notApplicableCvesIdToDetails.get(scannedCve); if (potential) { - relevantNonApplicableCve.set(scannedCve, potential); + relevantNotApplicableCve.set(scannedCve, potential); } } } return { scannedCve: Array.from(relevantScannedCve), applicableCve: Object.fromEntries(relevantApplicableCve.entries()), - nonapplicableCve: Object.fromEntries(relevantNonApplicableCve.entries()) + notApplicableCve: Object.fromEntries(relevantNotApplicableCve.entries()) } as ApplicabilityScanResponse; } @@ -308,7 +308,7 @@ export class ApplicabilityRunner extends JasRunner { // Prepare const analyzerScanRun: AnalyzerScanRun = response.runs[0]; const applicable: Map = new Map(); - const nonapplicable: Map = new Map(); + const notApplicable: Map = new Map(); const scanned: Set = new Set(); const rulesFullDescription: Map = new Map(); const applicabilityStatues: Map = new Map(); @@ -340,7 +340,7 @@ export class ApplicabilityRunner extends JasRunner { fileIssues.locations.push(location.physicalLocation.region); }); } else if (status === ApplicabilityStatus.NOT_APPLICABLE) { - this.getOrCreateApplicableDetails(analyzeIssue, nonapplicable, rulesFullDescription.get(analyzeIssue.ruleId)); + this.getOrCreateApplicableDetails(analyzeIssue, notApplicable, rulesFullDescription.get(analyzeIssue.ruleId)); } scanned.add(this.getCveFromRuleId(analyzeIssue.ruleId)); }); @@ -349,7 +349,7 @@ export class ApplicabilityRunner extends JasRunner { return { scannedCve: Array.from(scanned), applicableCve: Object.fromEntries(applicable.entries()), - nonapplicableCve: Object.fromEntries(nonapplicable.entries()) + notApplicableCve: Object.fromEntries(notApplicable.entries()) } as ApplicabilityScanResponse; } diff --git a/src/main/treeDataProviders/utils/analyzerUtils.ts b/src/main/treeDataProviders/utils/analyzerUtils.ts index cf8c425b..599d0f3d 100644 --- a/src/main/treeDataProviders/utils/analyzerUtils.ts +++ b/src/main/treeDataProviders/utils/analyzerUtils.ts @@ -221,7 +221,7 @@ export class AnalyzerUtils { dependencyScanResults.applicableIssues ? Object.entries(dependencyScanResults.applicableIssues.applicableCve) : [] ); descriptorNode.notApplicableCve = new Map( - dependencyScanResults.applicableIssues ? Object.entries(dependencyScanResults.applicableIssues.nonapplicableCve) : [] + dependencyScanResults.applicableIssues ? Object.entries(dependencyScanResults.applicableIssues.notApplicableCve) : [] ); descriptorNode.applicableScanTimeStamp = dependencyScanResults.applicableScanTimestamp; diff --git a/src/test/tests/integration/applicability.test.ts b/src/test/tests/integration/applicability.test.ts index 7e749a3b..8fa48ba8 100644 --- a/src/test/tests/integration/applicability.test.ts +++ b/src/test/tests/integration/applicability.test.ts @@ -77,7 +77,7 @@ describe('Applicability Integration Tests', async () => { }); it('Check all expected nonapplicable CVE detected', () => { - assert.includeDeepMembers(Object.keys(response.nonapplicableCve), Object.keys(expectedContent.nonapplicableCve)); + assert.includeDeepMembers(Object.keys(response.notApplicableCve), Object.keys(expectedContent.notApplicableCve)); }); describe('Applicable details data validations', () => {