Skip to content

Update GitHub examples to use scan_params instead of additional_params #61

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

Open
mandreko-bitwarden wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update GitHub examples to use scan_params instead of additional_params #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Github/ast-private-registry-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ name: Checkmarx Scan
# Controls when the workflow will run
on:
push:
branches: [ "master" ]
branches: ["master"]
workflow_dispatch:

permissions:
Expand All @@ -37,7 +37,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job

steps:
- name : Checkout repository
- name: Checkout repository
uses: actions/checkout@v4

- name: Checkmarx One scan
Expand All @@ -51,13 +51,13 @@ jobs:
USERNAME_MYCOMPANY_JFROG_IO: ${{ secrets.JFROG_USERNAME }}
PASSWORD_MYCOMPANY_JFROG_IO: ${{ secrets.JFROG_ACCESS_TOKEN }}
with:
base_uri: https://eu.ast.checkmarx.net # This should be replaced by your base uri for Checkmarx One
base_uri: https://eu.ast.checkmarx.net # This should be replaced by your base uri for Checkmarx One
cx_client_id: ${{ secrets.CX_CLIENT_ID }} # This should be created within your Checkmarx One account : https://checkmarx.com/resource/documents/en/34965-118315-authentication-for-checkmarx-one-cli.html#UUID-a4e31a96-1f36-6293-e95a-97b4b9189060_UUID-4123a2ff-32d0-2287-8dd2-3c36947f675e
cx_client_secret: ${{ secrets.CX_CLIENT_SECRET }} # This should be created within your Checkmarx One account : https://checkmarx.com/resource/documents/en/34965-118315-authentication-for-checkmarx-one-cli.html#UUID-a4e31a96-1f36-6293-e95a-97b4b9189060_UUID-4123a2ff-32d0-2287-8dd2-3c36947f675e
cx_tenant: ${{ secrets.CX_TENANT }} # This should be replaced by your tenant for Checkmarx One
additional_params: --scan-types container-security --containers-local-resolution
scan_params: --scan-types container-security --containers-local-resolution
- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v3
with:
# Path to SARIF file relative to the root of the repository
sarif_file: cx_result.sarif
# Path to SARIF file relative to the root of the repository
sarif_file: cx_result.sarif
2 changes: 1 addition & 1 deletion Github/sarif-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
cx_client_id: ${{ secrets.CX_CLIENT_ID }}
cx_client_secret: ${{ secrets.CX_CLIENT_SECRET }}
cx_tenant: ${{ secrets.CX_TENANT }} # This should be replaced by users' tenant name
additional_params: --report-format sarif --output-path .
scan_params: --report-format sarif --output-path .
- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v2
with:
Expand Down
15 changes: 7 additions & 8 deletions Sonar/ci-maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:

jobs:
scan:

runs-on: ubuntu-latest
if: ${{ true }}

Expand Down Expand Up @@ -38,15 +37,15 @@ jobs:
- name: Checkmarx AST CLI Action
uses: checkmarx/ast-github-action@main
with:
project_name: <your_project_name>
base_uri: <AST Base URI>
cx_tenant: ${{ secrets.CX_TENANT }}
cx_client_id: ${{ secrets.CX_CLIENT_ID }}
cx_client_secret: ${{ secrets.CX_CLIENT_SECRET }}
additional_params: --report-format sonar
project_name: <your_project_name>
base_uri: <AST Base URI>
cx_tenant: ${{ secrets.CX_TENANT }}
cx_client_id: ${{ secrets.CX_CLIENT_ID }}
cx_client_secret: ${{ secrets.CX_CLIENT_SECRET }}
scan_params: --report-format sonar

- name: Sonar analyze
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=<sonar_project_key> -Dsonar.organization=<sonar_organization> -Dsonar.externalIssuesReportPaths=./cx_result_sonar.json
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=<sonar_project_key> -Dsonar.organization=<sonar_organization> -Dsonar.externalIssuesReportPaths=./cx_result_sonar.json
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
4 changes: 2 additions & 2 deletions Sonar/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
cx_tenant: ${{ secrets.TENANT }}
cx_client_id: ${{ secrets.CLIENT_ID }}
cx_client_secret: ${{ secrets.SECRET }}
additional_params: --report-format sonar
- name: Sonar CLI Action
scan_params: --report-format sonar
- name: Sonar CLI Action
uses: sonarsource/sonarqube-scan-action@master
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand Down