From 88b9f4483a5d756abba34f1bf962836f96e02a53 Mon Sep 17 00:00:00 2001 From: Pedro Lopes Date: Fri, 28 Oct 2022 11:56:20 +0100 Subject: [PATCH 1/4] treat additional params --- src/main/wrapper/CxWrapper.ts | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/wrapper/CxWrapper.ts b/src/main/wrapper/CxWrapper.ts index df3d71de..1a1bead1 100644 --- a/src/main/wrapper/CxWrapper.ts +++ b/src/main/wrapper/CxWrapper.ts @@ -83,10 +83,9 @@ export class CxWrapper { list.push(this.config.tenant); } if(this.config.additionalParameters){ - // this.config.additionalParameters.forEach(function (param){ - // list.push(param) - // }) - list.push(this.config.additionalParameters) + this.prepareAdditionalParams(this.config.additionalParameters).forEach(function (param){ + list.push(param) + }) } if (formatRequired) { list.push(CxConstants.FORMAT); @@ -116,13 +115,10 @@ export class CxWrapper { commands.push("-" + key.toString().replace(/_/g, "-").toLowerCase()); commands.push(value); } else if (key === CxParamType.ADDITIONAL_PARAMETERS) { - const paramList = value.match(/(?:[^\s"]+|"[^"]*")+/g); - logger.info("Additional parameters refined: " + paramList) - if (paramList) { - paramList.forEach((element) => { - commands.push(element); - }); - } + this.prepareAdditionalParams(this.config.additionalParameters).forEach((element) => { + logger.info("Additional parameter: " + element) + commands.push(element); + }); } }); const exec = new ExecutionService(); @@ -292,6 +288,17 @@ export class CxWrapper { return output.has(CxConstants.IDE_SCANS_KEY) && output.get(CxConstants.IDE_SCANS_KEY).toLowerCase() === " true"; } + prepareAdditionalParams(additionalParameters: string) : string[] { + const paramList = additionalParameters.match(/(?:[^\s"]+|"[^"]*")+/g); + let params: string[] = []; + logger.info("Additional parameters refined: " + paramList) + if (paramList) { + paramList.forEach((element) => { + params.push(element); + }); + } + return params; + } getIndexOfBflNode(bflNodes: CxBFL[], resultNodes: any[]): number { From ec29c41caafe5fe6920cc10d0e5e29287a664859 Mon Sep 17 00:00:00 2001 From: Pedro Lopes Date: Fri, 28 Oct 2022 14:22:30 +0100 Subject: [PATCH 2/4] fix linter --- src/main/wrapper/CxWrapper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/wrapper/CxWrapper.ts b/src/main/wrapper/CxWrapper.ts index 1a1bead1..3b0a3eee 100644 --- a/src/main/wrapper/CxWrapper.ts +++ b/src/main/wrapper/CxWrapper.ts @@ -290,7 +290,7 @@ export class CxWrapper { prepareAdditionalParams(additionalParameters: string) : string[] { const paramList = additionalParameters.match(/(?:[^\s"]+|"[^"]*")+/g); - let params: string[] = []; + const params: string[] = []; logger.info("Additional parameters refined: " + paramList) if (paramList) { paramList.forEach((element) => { From a614b0bde19994d4e6508858cb19ac746dda6881 Mon Sep 17 00:00:00 2001 From: Pedro Lopes Date: Mon, 7 Nov 2022 13:36:40 +0000 Subject: [PATCH 3/4] fix branch name --- src/main/scan/CxScan.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scan/CxScan.ts b/src/main/scan/CxScan.ts index 2c5d3e83..d0f3ccc9 100644 --- a/src/main/scan/CxScan.ts +++ b/src/main/scan/CxScan.ts @@ -24,7 +24,7 @@ export default class CxScan { scan.groups = member.Groups; scan.origin = member.Origin; scan.initiator = member.Initiator; - scan.branch = member.Initiator; + scan.branch = member.Branch; return scan; }); } else { @@ -38,7 +38,7 @@ export default class CxScan { scan.groups = resultObject.Groups; scan.origin = resultObject.Origin; scan.initiator = resultObject.Initiator; - scan.branch = resultObject.Initiator; + scan.branch = resultObject.Branch; scans.push(scan); } return scans; From 7dc774585a416880270d234dd5e5d821ece2949f Mon Sep 17 00:00:00 2001 From: Pedro Lopes Date: Mon, 7 Nov 2022 14:57:04 +0000 Subject: [PATCH 4/4] fix test --- src/tests/ScanTest.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/ScanTest.test.ts b/src/tests/ScanTest.test.ts index 01c5b5ab..acf2ab4a 100644 --- a/src/tests/ScanTest.test.ts +++ b/src/tests/ScanTest.test.ts @@ -71,7 +71,7 @@ describe("ScanCreate cases", () => { const scanObject = cxCommandOutput.payload.pop(); const scanShowObject = await auth.scanShow(scanObject.id); console.log(" Json object from successful no wait mode case: " + JSON.stringify(scanShowObject)); - expect(scanShowObject.payload.pop().status).toEqual("Running"); + expect(scanShowObject.payload.pop().status).toEqual("Partial"); }) it('ScanCancel Successful case', async () => {