change nonapplicable to notApplicable

jfrog · Oct 13, 2024 · 28547b1 · 28547b1
1 parent 75af5d7
commit 28547b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>(
-            Object.entries(scanResponse.nonapplicableCve)
+            Object.entries(scanResponse.notApplicableCve)
         );
         let relevantScannedCve: string[] = [];
         let relevantApplicableCve: Map<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>();
-        let relevantNonApplicableCve: Map<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>();
+        let relevantNotApplicableCve: Map<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>();
 
         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<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>();
-        const nonapplicable: Map<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>();
+        const notApplicable: Map<string, CveApplicableDetails> = new Map<string, CveApplicableDetails>();
         const scanned: Set<string> = new Set<string>();
         const rulesFullDescription: Map<string, string> = new Map<string, string>();
         const applicabilityStatues: Map<string, ApplicabilityStatus> = new Map<string, ApplicabilityStatus>();
@@ -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
@@ -221,7 +221,7 @@ export class AnalyzerUtils {
             dependencyScanResults.applicableIssues ? Object.entries(dependencyScanResults.applicableIssues.applicableCve) : []
         );
         descriptorNode.notApplicableCve = new Map<string, CveApplicableDetails>(
-            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
@@ -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', () => {