Skip to content

Commit 9cd2ff7

Browse files
Merge branch 'main' into other/checkIntegrationTests
2 parents 9bc5fb4 + 295f6da commit 9cd2ff7

File tree

11 files changed

+114
-79
lines changed

11 files changed

+114
-79
lines changed

.github/workflows/ast-scan.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Checkmarx One Scan
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
schedule:
9+
- cron: '00 7 * * *' # Every day at 07:00
10+
11+
jobs:
12+
cx-scan:
13+
name: Checkmarx One Scan
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
18+
- name: Checkmarx One CLI Action
19+
uses: checkmarx/ast-github-action@03a90e7253dadd7e2fff55f5dfbce647b39040a1 # v.2.0.37
20+
with:
21+
base_uri: ${{ secrets.AST_RND_SCANS_BASE_URI }}
22+
cx_tenant: ${{ secrets.AST_RND_SCANS_TENANT }}
23+
cx_client_id: ${{ secrets.AST_RND_SCANS_CLIENT_ID }}
24+
cx_client_secret: ${{ secrets.AST_RND_SCANS_CLIENT_SECRET }}
25+
additional_params: --tags phoenix --threshold "sca-critical=1;sca-high=1;sca-medium=1;sca-low=1;sast-critical=1;sast-high=1;sast-medium=1;sast-low=1;iac-security-critical=1;iac-security-high=1;iac-security-medium=1;iac-security-low=1"

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
sudo apt-get install git-lfs
1616
git lfs install
1717
18-
- name: Use Node.js 14
18+
- name: Use Node.js 22.11.0
1919
uses: actions/[email protected]
2020
with:
21-
node-version: 14
21+
node-version: 22.11.0
2222
registry-url: https://npm.pkg.github.com/
2323
- run: npm ci
2424
- name: Code Linting

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
# SETUP NODE
6969
- uses: actions/[email protected]
7070
with:
71-
node-version: 14
71+
node-version: 22.11.0
7272
registry-url: https://npm.pkg.github.com/
7373

7474
# GET TAG NAME

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Each line is a file pattern followed by one or more owners
33

44
# Specify the default owners for the entire repository
5-
* @OrShamirCM @AlvoBen @pedrompflopes
5+
* @AlvoBen @greensd4 @miryamfoiferCX

checkmarx-ast-cli.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.3
1+
2.3.6

package-lock.json

Lines changed: 74 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@CheckmarxDev/ast-cli-javascript-wrapper",
3-
"version": "0.0.117",
3+
"version": "0.0.120",
44
"description": "AST CLI Javascript wrapper",
55
"main": "dist/main/wrapper/CxWrapper.js",
66
"typings": "dist/main/wrapper/CxWrapper.d.ts",
@@ -27,7 +27,7 @@
2727
"homepage": "https://github.com/CheckmarxDev/ast-cli-javascript-wrapper#readme",
2828
"devDependencies": {
2929
"@types/jest": "^27.5.0",
30-
"@types/node": "^20.14.11",
30+
"@types/node": "^22.9.0",
3131
"@typescript-eslint/eslint-plugin": "^5.29.0",
3232
"@typescript-eslint/parser": "^5.29.0",
3333
"copyfiles": "^2.4.1",
@@ -36,7 +36,7 @@
3636
"jest-cli": "29.7.0",
3737
"ts-jest": "^29.2.2",
3838
"ts-mockito": "^2.6.1",
39-
"typescript": "^5.5.3"
39+
"typescript": "^5.6.3"
4040
},
4141
"overrides": {
4242
"bluebird": "3.7.2"

src/main/wrapper/ExecutionService.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ export class ExecutionService {
153153
logger.info("Exit code received from AST-CLI: " + code);
154154
if(code==1){
155155
stderr = stdout
156+
reject(stderr)
156157
}
157158
resolve(ExecutionService.onCloseMapTenantOutputCommand(code, stderr, stdout));
158159
});
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:64cea076d62a35ce180217982561212d75d3b1478b4a37991d1b76c0508455f4
3-
size 66183320
2+
oid sha256:47bb748fc38efb83feb386cf8227f44aed159d8b5c3f99fe9b9255b3467c046b
3+
size 66420888

0 commit comments

Comments
 (0)