diff --git a/Github/ast-private-registry-scan.yml b/Github/ast-private-registry-scan.yml index e5b3db5..7bab09d 100644 --- a/Github/ast-private-registry-scan.yml +++ b/Github/ast-private-registry-scan.yml @@ -16,7 +16,7 @@ name: Checkmarx Scan # Controls when the workflow will run on: push: - branches: [ "master" ] + branches: ["master"] workflow_dispatch: permissions: @@ -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 @@ -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 \ No newline at end of file + # Path to SARIF file relative to the root of the repository + sarif_file: cx_result.sarif diff --git a/Github/sarif-output.yml b/Github/sarif-output.yml index a28bc0d..f657f8e 100644 --- a/Github/sarif-output.yml +++ b/Github/sarif-output.yml @@ -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: diff --git a/Sonar/ci-maven.yml b/Sonar/ci-maven.yml index d8cedd5..9a66948 100644 --- a/Sonar/ci-maven.yml +++ b/Sonar/ci-maven.yml @@ -6,7 +6,6 @@ on: jobs: scan: - runs-on: ubuntu-latest if: ${{ true }} @@ -38,15 +37,15 @@ jobs: - name: Checkmarx AST CLI Action uses: checkmarx/ast-github-action@main with: - project_name: - 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: + 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= -Dsonar.organization= -Dsonar.externalIssuesReportPaths=./cx_result_sonar.json + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey= -Dsonar.organization= -Dsonar.externalIssuesReportPaths=./cx_result_sonar.json env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} GITHUB_TOKEN: ${{ github.token }} diff --git a/Sonar/ci.yml b/Sonar/ci.yml index 5e4d4a3..1a034a1 100644 --- a/Sonar/ci.yml +++ b/Sonar/ci.yml @@ -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 }}