Merge branch 'master' into AST-68548

Checkmarx · Dec 9, 2024 · c7c97c3 · c7c97c3
2 parents 51fe385 + 67de28c
commit c7c97c3
Show file tree

Hide file tree

Showing 1,777 changed files with 2,846 additions and 2,939 deletions.
diff --git a/.github/scripts/queries-validator/metadata-schema.json b/.github/scripts/queries-validator/metadata-schema.json
@@ -32,7 +32,8 @@
         "descriptionUrl",
         "cloudProvider",
         "platform",
-        "descriptionID"
+        "descriptionID", 
+        "cwe"
     ],
     "properties": {
         "id": {

diff --git a/.github/scripts/server-mock/package-lock.json b/.github/scripts/server-mock/package-lock.json
diff --git a/.github/workflows/go-ci-integration.yml b/.github/workflows/go-ci-integration.yml
@@ -49,7 +49,7 @@ jobs:
         run: echo ${{ steps.docker_build.outputs.digest }}
       - name: Run docker image and generate results.json
         run: |
-          docker run -v ${PWD}/assets/queries:/path \
+          docker run --user $(id -u):$(id -g) -v ${PWD}/assets/queries:/path \
             kics:${{ github.sha }} scan \
             --silent \
             --disable-full-descriptions \

diff --git a/.github/workflows/go-e2e.yaml b/.github/workflows/go-e2e.yaml
@@ -96,9 +96,10 @@ jobs:
       - name: Get docker name
         run: |
           DOCKER_NAME=$(echo ${{ matrix.kics-docker }} | sed 's/\//-/')
+          echo "DOCKER_NAME=$DOCKER_NAME" >> $GITHUB_ENV
       - name: Archive test report
         if: always()
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
         with:
-          name: e2e-tests-report-$DOCKER_NAME
+          name: e2e-tests-report-${{ env.DOCKER_NAME }}
           path: e2e-report.html
diff --git a/.github/workflows/kics-gh-action.yaml b/.github/workflows/kics-gh-action.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Run KICS Scan
-        uses: checkmarx/kics-github-action@252e73959bd4809a14863cbfbb42d7a90d5a4860 # v2.1.1
+        uses: checkmarx/kics-github-action@94469746ec2c43de89a42fb9d2a80070f5d25b16 # v2.1.3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: "./Dockerfile"

diff --git a/.github/workflows/release-apispec.yml b/.github/workflows/release-apispec.yml