Skip to content

Fix global additional parameters parsing #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 7, 2022
Merged

Fix global additional parameters parsing #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88b9f44
treat additional params
cx-pedro-lopes Oct 28, 2022
ec29c41
fix linter
cx-pedro-lopes Oct 28, 2022
a614b0b
fix branch name
cx-pedro-lopes Nov 7, 2022
7dc7745
fix test
cx-pedro-lopes Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scan/CxScan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
29 changes: 18 additions & 11 deletions src/main/wrapper/CxWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
const params: string[] = [];
logger.info("Additional parameters refined: " + paramList)
if (paramList) {
paramList.forEach((element) => {
params.push(element);
});
}
return params;
}

getIndexOfBflNode(bflNodes: CxBFL[], resultNodes: any[]): number {

Expand Down
2 changes: 1 addition & 1 deletion src/tests/ScanTest.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down