added "multiple singleton" - one for each different scan configuration and log file path

Author: BenAlvo1

src/main/wrapper/CxWrapper.ts

@@ -13,7 +13,7 @@ import {Semaphore} from "async-mutex";
 type ParamTypeMap = Map<CxParamType, string>;
 
 export class CxWrapper {
-    private static instance: CxWrapper;
+    private static instances =new Map<string, CxWrapper>();
     private static semaphore = new Semaphore(1);  // Semaphore with 1 slot
     config: CxConfig;
     cxInstaller: CxInstaller;
@@ -51,12 +51,19 @@ export class CxWrapper {
 
     static async getInstance(cxScanConfig: CxConfig, logFilePath: string): Promise<CxWrapper> {
         const [_, release] = await this.semaphore.acquire();
-        if (!CxWrapper.instance) {
-            CxWrapper.instance = new CxWrapper(cxScanConfig, logFilePath);
+        let key = this.generateKey(cxScanConfig, logFilePath);
+        let wrapper = CxWrapper.instances.get(key);
+        if (!wrapper) {
+            wrapper = new CxWrapper(cxScanConfig, logFilePath);
+            CxWrapper.instances.set(key, wrapper);
         }
         release();
 
-        return CxWrapper.instance;
+        return wrapper;
+    }
+    
+    static generateKey(config:CxConfig,logFilePath:string): string {
+        return `${config.baseUri}${config.baseAuthUri}${config.clientId}${config.clientSecret}${config.apiKey}${config.tenant}${config.additionalParameters}${config.pathToExecutable}${logFilePath}`.toLowerCase();
     }
 
     async init(): Promise<void> {

src/main/wrapper/CxWrapperFactory.ts

@@ -2,12 +2,9 @@ import {CxWrapper} from "./CxWrapper";
 import {CxConfig} from "./CxConfig";
 
 class CxWrapperFactory {
-    static async createWrapper(cxScanConfig: CxConfig, logFilePath?: string, type?: string): Promise<CxWrapper> {
+    static async createWrapper(cxScanConfig: CxConfig, logFilePath?: string): Promise<CxWrapper> {
         let wrapper: CxWrapper;
         wrapper = await CxWrapper.getInstance(cxScanConfig, logFilePath);
-        if (type === 'mock') {
-            wrapper = wrapper.cloneWithNewConfig(cxScanConfig);
-        }
         await wrapper.init();
         return wrapper;
     }

src/tests/AuthTest.test.ts

@@ -18,7 +18,8 @@ describe("Authentication validation", () => {
         cxScanConfig_fail.clientSecret = "error";
         cxScanConfig_fail.tenant = process.env["CX_TENANT"];
         cxScanConfig_fail.apiKey = "error";
-        const auth = await CxWrapperFactory.createWrapper(cxScanConfig_fail, null, 'mock');
+        let auth = await CxWrapperFactory.createWrapper(cxScanConfig_fail);
+        auth = auth.cloneWithNewConfig(cxScanConfig_fail);
         const cxCommandOutput: CxCommandOutput = await auth.authValidate();
         expect(cxCommandOutput.exitCode).toBe(1);
     });