CR

jfrog · Oct 12, 2023 · 0ab640b · 0ab640b
1 parent db359b8
commit 0ab640b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/src/main/scanLogic/scanRunners/analyzerModels.ts b/src/main/scanLogic/scanRunners/analyzerModels.ts
@@ -3,7 +3,7 @@ export interface AnalyzerRequest {
 }
 
 export enum ScanType {
-    ContextualAnalysis = 'analyze-applicability',
+    AnalyzeApplicability = 'analyze-applicability',
     Iac = 'iac-scan-modules',
     Sast = 'sast',
     Secrets = 'secrets-scan'

diff --git a/src/main/scanLogic/scanRunners/applicabilityScan.ts b/src/main/scanLogic/scanRunners/applicabilityScan.ts
@@ -56,7 +56,7 @@ export class ApplicabilityRunner extends JasRunner {
         logManager: LogManager,
         binary?: Resource
     ) {
-        super(connectionManager, ScanType.ContextualAnalysis, logManager, new AppsConfigModule(), binary);
+        super(connectionManager, ScanType.AnalyzeApplicability, logManager, new AppsConfigModule(), binary);
     }
 
     /** @override */
@@ -94,7 +94,7 @@ export class ApplicabilityRunner extends JasRunner {
             let startApplicableTime: number = Date.now();
 
             const request: ApplicabilityScanArgs = {
-                type: ScanType.ContextualAnalysis,
+                type: ScanType.AnalyzeApplicability,
                 roots: [workspacePath],
                 cve_whitelist: Array.from(cveToScan),
                 skipped_folders: excludePatterns

diff --git a/src/main/scanLogic/scanRunners/jasRunner.ts b/src/main/scanLogic/scanRunners/jasRunner.ts
@@ -398,25 +398,28 @@ export abstract class JasRunner {
         this._logManager.debug('Input YAML:\n' + request);
 
         // 2. Run the binary
-        await this.runBinary(requestPath, this._verbose ? undefined : path.dirname(requestPath), checkCancel, responsePath).catch(error => {
-            if (error.code) {
+        try {
+            await this.runBinary(requestPath, this._verbose ? undefined : path.dirname(requestPath), checkCancel, responsePath);
+        } catch (error) {
+            let code: number | undefined = (<any>error).code;
+            if (code) {
                 // Not entitled to run binary
-                if (error.code === JasRunner.NOT_ENTITLED) {
+                if (code === JasRunner.NOT_ENTITLED) {
                     throw new NotEntitledError();
                 }
-                if (error.code === JasRunner.NOT_SUPPORTED) {
+                if (code === JasRunner.NOT_SUPPORTED) {
                     throw new NotSupportedError(Translators.toAnalyzerTypeString(this._scanType));
                 }
-                if (error.code === JasRunner.OS_NOT_SUPPORTED) {
+                if (code === JasRunner.OS_NOT_SUPPORTED) {
                     throw new OsNotSupportedError(Translators.toAnalyzerTypeString(this._scanType));
                 }
                 this._logManager.logMessage(
-                    "Binary '" + Translators.toAnalyzerTypeString(this._scanType) + "' task ended with status code: " + error.code,
+                    "Binary '" + Translators.toAnalyzerTypeString(this._scanType) + "' task ended with status code: " + code,
                     'ERR'
                 );
             }
             throw error;
-        });
+        }
         // 3. Collect responses
         if (!fs.existsSync(responsePath)) {
             throw new Error(

diff --git a/src/main/utils/jfrogAppsConfig/jfrogAppsConfig.ts b/src/main/utils/jfrogAppsConfig/jfrogAppsConfig.ts
@@ -63,7 +63,7 @@ export class AppsConfigModule {
                         this._excludeScanners.push(ScanType.Secrets);
                         break;
                     case ExcludeScannerName.ContextualAnalysis:
-                        this._excludeScanners.push(ScanType.ContextualAnalysis);
+                        this._excludeScanners.push(ScanType.AnalyzeApplicability);
                 }
             }
         }
@@ -153,7 +153,7 @@ export class AppsConfigModule {
                     excludeScanners.push(ScanType.Secrets);
                     break;
                 case ExcludeScannerName.ContextualAnalysis:
-                    excludeScanners.push(ScanType.ContextualAnalysis);
+                    excludeScanners.push(ScanType.AnalyzeApplicability);
             }
         }
         return excludeScanners;

diff --git a/src/main/utils/translators.ts b/src/main/utils/translators.ts
@@ -30,7 +30,7 @@ import { Utils } from './utils';
 export class Translators {
     public static toAnalyzerTypeString(type: ScanType): string {
         switch (type) {
-            case ScanType.ContextualAnalysis:
+            case ScanType.AnalyzeApplicability:
                 return 'contextual-analysis';
             case ScanType.Iac:
                 return 'iac-scan';

diff --git a/src/test/tests/appsConfig.test.ts b/src/test/tests/appsConfig.test.ts
@@ -43,7 +43,7 @@ describe('JFrog Apps Config Tests', () => {
     ].forEach(testCase => {
         it('Should skip scanner - ' + testCase.excludeScanners, () => {
             let module: AppsConfigModule = new AppsConfigModule({ exclude_scanners: testCase.excludeScanners } as Module);
-            assert.equal(module.ShouldSkipScanner(ScanType.ContextualAnalysis), testCase.shouldSkip);
+            assert.equal(module.ShouldSkipScanner(ScanType.AnalyzeApplicability), testCase.shouldSkip);
         });
     });
 

diff --git a/src/test/tests/scanAnlayzerRunner.test.ts b/src/test/tests/scanAnlayzerRunner.test.ts
@@ -16,7 +16,7 @@ import { Translators } from '../../main/utils/translators';
 describe('Analyzer BinaryRunner tests', async () => {
     let logManager: LogManager = new LogManager().activate();
     let connectionManager: ConnectionManager = createBinaryRunnerConnectionManager('url', 'username', 'pass', 'token');
-    const dummyName: ScanType = ScanType.ContextualAnalysis;
+    const dummyName: ScanType = ScanType.AnalyzeApplicability;
 
     function createBinaryRunnerConnectionManager(inputUrl: string, user: string, pass: string, token: string): ConnectionManager {
         return {
@@ -161,7 +161,7 @@ describe('Analyzer BinaryRunner tests', async () => {
         });
     });
 
-    function getAnalyzeScanRequest(roots: string[], scanType: ScanType = ScanType.ContextualAnalysis): AnalyzeScanRequest {
+    function getAnalyzeScanRequest(roots: string[], scanType: ScanType = ScanType.AnalyzeApplicability): AnalyzeScanRequest {
         return {
             type: scanType,
             output: '/path/to/output.json',