Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules
dist
tmp
coverage
.github
/**/node_modules/*
node_modules/
dist/
tmp/
coverage/
.github/
2 changes: 1 addition & 1 deletion checkmarx-ast-cli.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.65
2.0.66
1,157 changes: 446 additions & 711 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"devDependencies": {
"@types/jest": "^27.5.0",
"@types/node": "^20.11.16",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/eslint-plugin": "5.0.0",
"@typescript-eslint/parser": "5.0.0",
"copyfiles": "^2.4.1",
"eslint": "^8.56.0",
"eslint": "8.1.0",
"jest": "^26.6.3",
"jest-cli": "29.7.0",
"ts-jest": "^26.0.0",
Expand Down
4 changes: 1 addition & 3 deletions src/main/wrapper/CxConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export enum CxConstants {
BASE_AUTH_URI = "--base-auth-uri",
CMD_UTILS = "utils",
CMD_REMEDIATION = "remediation",
SUB_CMD_REMEDIATION_KICS = "kics",
SUB_CMD_REMEDIATION_SCA = "sca",
SUB_CMD_TENANT = "tenant",
KICS_REMEDIATION_RESULTS_FILE = "--results-file",
Expand All @@ -44,7 +43,7 @@ export enum CxConstants {
CMD_SCA_REALTIME = "sca-realtime",
CMD_SCA_REALTIME_PROJECT_DIR = "--project-dir",
CMD_CHAT = "chat",
CMD_KICS_CHAT = "kics",
KICS = "kics",
CMD_CHAT_APIKEY = "--chat-apikey",
CMD_CHAT_FILE = "--result-file",
CMD_CHAT_LINE = "--result-line",
Expand All @@ -54,7 +53,6 @@ export enum CxConstants {
CMD_CHAT_CONVERSATION_ID = "--conversation-id",
CMD_CHAT_MODEL = "--model",
CMD_MASK_SECRETS = "mask",
CMD_SAST_CHAT = "sast",
CMD_SAST_CHAT_RESULT_ID = "--sast-result-id",
CMD_SAST_CHAT_RESULT_RESULTS_FILE = "--scan-results-file",
CMD_SAST_CHAT_RESULT_SOURCE_FILE = "--source-dir",
Expand Down
6 changes: 3 additions & 3 deletions src/main/wrapper/CxWrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ export class CxWrapper {
}

async kicsRemediation(resultsFile: string, kicsFile:string, engine:string,similarityIds?: string):Promise<[Promise<CxCommandOutput>,any]> {
const commands: string[] = [CxConstants.CMD_UTILS, CxConstants.CMD_REMEDIATION,CxConstants.SUB_CMD_REMEDIATION_KICS,CxConstants.KICS_REMEDIATION_RESULTS_FILE, resultsFile, CxConstants.KICS_REMEDIATION_KICS_FILE, kicsFile];
const commands: string[] = [CxConstants.CMD_UTILS, CxConstants.CMD_REMEDIATION,CxConstants.KICS,CxConstants.KICS_REMEDIATION_RESULTS_FILE, resultsFile, CxConstants.KICS_REMEDIATION_KICS_FILE, kicsFile];
if(engine.length>0){
commands.push(CxConstants.ENGINE,engine)
}
Expand Down Expand Up @@ -312,7 +312,7 @@ export class CxWrapper {
async kicsChat(apikey: string, file: string, line: number, severity: string, vulnerability: string, input: string, conversationId?: string, model?: string): Promise<CxCommandOutput> {
const commands: string[] = [
CxConstants.CMD_CHAT,
CxConstants.CMD_KICS_CHAT,
CxConstants.KICS,
CxConstants.CMD_CHAT_APIKEY, apikey,
CxConstants.CMD_CHAT_FILE, file,
CxConstants.CMD_CHAT_LINE, line.toString(),
Expand All @@ -333,7 +333,7 @@ export class CxWrapper {
async sastChat(apikey: string, sourceFile: string, resultsFile: string, resultID: string, input: string, conversationId?: string, model?: string): Promise<CxCommandOutput> {
const commands: string[] = [
CxConstants.CMD_CHAT,
CxConstants.CMD_SAST_CHAT,
CxConstants.SAST,
CxConstants.CMD_SAST_CHAT_RESULT_ID, resultID,
CxConstants.CMD_SAST_CHAT_RESULT_RESULTS_FILE, resultsFile,
CxConstants.CMD_SAST_CHAT_RESULT_SOURCE_FILE, sourceFile,
Expand Down
Binary file modified src/main/wrapper/resources/cx-linux
Binary file not shown.
Binary file modified src/main/wrapper/resources/cx-mac
Binary file not shown.
Binary file modified src/main/wrapper/resources/cx.exe
Binary file not shown.