log to file

Author: AndreGCX

src/main/wrapper/CxWrapper.ts

@@ -3,7 +3,7 @@ import {CxParamType} from "./CxParamType";
 import {CxConstants} from "./CxConstants";
 import {ExecutionService} from "./ExecutionService";
 import {CxCommandOutput} from "./CxCommandOutput";
-import { logger } from "./loggerConfig";
+import { getLoggerWithFilePath, logger } from "./loggerConfig";
 import * as fs from "fs"
 import * as os from "os";
 import CxBFL from "../bfl/CxBFL";
@@ -13,8 +13,11 @@ type ParamTypeMap = Map<CxParamType, string>;
 export class CxWrapper {
     config: CxConfig = new CxConfig();
 
-    constructor(cxScanConfig: CxConfig) {
+    constructor(cxScanConfig: CxConfig, logFilePath?: string) {
         let path = require("path");
+        
+        getLoggerWithFilePath(logFilePath)
+        
         if (cxScanConfig.clientId  && cxScanConfig.clientSecret) {
             logger.info("Received clientId and clientSecret");
             this.config.clientId = cxScanConfig.clientId;
@@ -119,7 +122,7 @@ export class CxWrapper {
 
     async scanCancel(id: string): Promise<CxCommandOutput> {
         const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.SUB_CMD_CANCEL, CxConstants.SCAN_ID, id];
-        commands.push(...this.initializeCommands(true));
+        commands.push(...this.initializeCommands(false));
         const exec = new ExecutionService();
         return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_TYPE);
     }

src/main/wrapper/loggerConfig.ts

@@ -1,14 +1,28 @@
 import { configure, getLogger } from 'log4js';
 
-// Appenders
-configure({
-  appenders: {
-    console: { type: 'stdout', layout: { type: "messagePassThrough" } },
-},
-categories: {
-    default: { appenders: ['console'], level: "info" }
+export function getLoggerWithFilePath(logFilePath ?: string) {
+
+  if(logFilePath) {
+    configure({
+      appenders: {
+        file: { type: 'fileSync', filename: logFilePath ? logFilePath : "" },
+        console: { type: 'stdout', layout: { type: "messagePassThrough" } },
+    },
+    categories: {
+        default: { appenders: ['console', 'file'], level: "info" }
+      }
+    });
+
+  } else {
+    configure({
+      appenders: {
+        console: { type: 'stdout', layout: { type: "messagePassThrough" } },
+    },
+    categories: {
+        default: { appenders: ['console'], level: "info" }
+      }
+    });
   }
-});
+} 
 
-// Fetch logger and export
 export const logger = getLogger();

src/tests/ScanTest.test.ts

@@ -72,4 +72,19 @@ describe("ScanCreate cases",() => {
         console.log(" Json object from successful no wait mode case: " + JSON.stringify(scanShowObject));
         expect(scanShowObject.payload.pop().status).toEqual("Running");
     })
+
+    it('ScanCancel Successful case', async () => {
+        const params = new Map();
+        params.set(CxParamType.PROJECT_NAME, "ast-cli-javascript-integration-cancel");
+        params.set(CxParamType.S, "./src");
+        params.set(CxParamType.BRANCH, "master");
+        params.set(CxParamType.FILTER, "*.ts,!**/node_modules/**/*");
+        params.set(CxParamType.ADDITIONAL_PARAMETERS, "--async");
+        const auth = new CxWrapper(cxScanConfig);
+        const cxCommandOutput: CxCommandOutput = await auth.scanCreate(params);
+        const scanObject = cxCommandOutput.payload.pop();
+        await auth.scanCancel(scanObject.id)
+        const scanShowObject = await auth.scanShow(scanObject.id);
+        expect(scanShowObject.exitCode).toEqual(0);
+    })
 });