Rename functions

Or-Geva · Nov 26, 2023 · daae70d · daae70d
1 parent 465bcd7
commit daae70d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/main/scanLogic/scanManager.ts b/src/main/scanLogic/scanManager.ts
@@ -54,12 +54,12 @@ export class ScanManager implements ExtensionComponent {
             progressManager,
             await new SupportedScans(this._connectionManager, this._logManager).getSupportedScans()
         );
-        const jasRunners: JasRunner[] = await entitledJasRunnerFactory.createConfigurableJasRunner();
+        const jasRunners: JasRunner[] = await entitledJasRunnerFactory.createJasRunner();
         progressManager.startStep('🔎 Scanning for issues', ScanManager.calculateNumberOfTasks(jasRunners, workspaceDescriptors));
         checkCanceled();
         await Promise.all([
             ...this.runDependenciesScans(workspaceDescriptors, root, checkCanceled, scanResults, progressManager, entitledJasRunnerFactory),
-            ...this.runAMScans(jasRunners)
+            ...this.runSourceCodeScans(jasRunners)
         ]);
         UsageUtils.sendUsageReport(entitledJasRunnerFactory.uniqFeatures, workspaceDescriptors, this.connectionManager);
     }
@@ -91,7 +91,7 @@ export class ScanManager implements ExtensionComponent {
         return scansPromises;
     }
 
-    private runAMScans(jasRunners: JasRunner[]): Promise<void>[] {
+    private runSourceCodeScans(jasRunners: JasRunner[]): Promise<void>[] {
         const scansPromises: Promise<void>[] = [];
         for (const runner of jasRunners) {
             if (runner.shouldRun()) {

diff --git a/src/main/scanLogic/scanRunners/jasRunner.ts b/src/main/scanLogic/scanRunners/jasRunner.ts
@@ -57,6 +57,10 @@ export abstract class JasRunner {
      */
     public abstract scan(): Promise<void>;
 
+    public get config() {
+        return this._config;
+    }
+
     /**
      * Run the executeBinary method with the provided request path
      * @param yamlConfigPath        - Path to the request

diff --git a/src/main/scanLogic/sourceCodeScan/jasRunnerFactory.ts b/src/main/scanLogic/sourceCodeScan/jasRunnerFactory.ts
@@ -39,7 +39,7 @@ export class JasRunnerFactory {
     }
 
     // Jas scanner support JFrog config file. Applicability is not supported by jfrog config so we create a default runner to run on the workspace.
-    public async createConfigurableJasRunner(): Promise<JasRunner[]> {
+    public async createJasRunner(): Promise<JasRunner[]> {
         let jasRunners: JasRunner[] = [];
 
         jasRunners.push(...this.createSastRunners());
@@ -55,7 +55,7 @@ export class JasRunnerFactory {
             this._logManager.logMessage('Static Application Security scanner is not entitled to scan workspace ', 'INFO');
             return sastRunners;
         }
-        for (const configModule of this.getModulesFromConfig()) {
+        for (const configModule of this.createModulesConfig()) {
             sastRunners.push(
                 new SastRunner(
                     this.scanResults,
@@ -80,7 +80,7 @@ export class JasRunnerFactory {
             this._logManager.logMessage('Infrastructure as Code scanner is not entitled to scan workspace', 'INFO');
             return iacRunners;
         }
-        for (const configModule of this.getModulesFromConfig()) {
+        for (const configModule of this.createModulesConfig()) {
             iacRunners.push(
                 new IacRunner(
                     this.scanResults,
@@ -105,7 +105,7 @@ export class JasRunnerFactory {
             this._logManager.logMessage('Secrets scanner is not entitled to scan workspace', 'INFO');
             return secretsRunners;
         }
-        for (const configModule of this.getModulesFromConfig()) {
+        for (const configModule of this.createModulesConfig()) {
             secretsRunners.push(
                 new SecretsRunner(
                     this.scanResults,