Update scan-folders for trivy (#535)

* Update Scan folders

* Update Scan folders
This commit is contained in:
Corneil du Plessis
2024-04-02 17:23:57 +02:00
committed by GitHub
parent 40729c835c
commit bb002db99f
3 changed files with 16 additions and 11 deletions

View File

@@ -127,8 +127,9 @@ jobs:
- name: Scan Jar files
shell: bash
run: |
ROOT_DIR=$(realpath $PWD)
pushd stream-applications > /dev/null
./scan-folders.sh table
$ROOT_DIR/scan-folders.sh table
popd > /dev/null
- name: 'Upload: Error logs'
if: ${{ failure() }}

View File

@@ -360,11 +360,12 @@ jobs:
- name: Scan Jar files
shell: bash
run: |
ROOT_DIR=$(realpath $PWD)
pushd stream-applications > /dev/null
./scan-folders.sh
$ROOT_DIR/scan-folders.sh
popd > /dev/null
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'stream-applications/scan.sarif'
- name: 'Configure: Docker login'
@@ -499,11 +500,12 @@ jobs:
- name: Scan Jar files
shell: bash
run: |
ROOT_DIR=$(realpath $PWD)
pushd stream-applications > /dev/null
./scan-folders.sh
$ROOT_DIR/scan-folders.sh
popd > /dev/null
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'stream-applications/scan.sarif'
- name: 'Configure: Docker login'
@@ -639,11 +641,12 @@ jobs:
- name: Scan Jar files
shell: bash
run: |
ROOT_DIR=$(realpath $PWD)
pushd stream-applications > /dev/null
./scan-folders.sh
$ROOT_DIR/scan-folders.sh
popd > /dev/null
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'stream-applications/scan.sarif'
- name: 'Configure: Docker login'

View File

@@ -11,9 +11,10 @@ while [ "$1" != "" ]; do
fi
shift
done
find $SCDIR -type d -name target -exec bash "$SCDIR/scan-jars.sh" '{}' \;
find . -type d -name target -exec bash "$SCDIR/scan-jars.sh" '{}' \;
echo "{\"version\": \"2.1.0\", \"\$schema\": \"https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json\", \"runs\": [" > "$SCDIR/scan.sarif"
if [ -f "$SCDIR/runs.sarif" ]; then
echo "{\"version\": \"2.1.0\", \"\$schema\": \"https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json\", \"runs\": [" > $SCDIR/scan.sarif
cat "$SCDIR/runs.sarif" >> $SCDIR/scan.sarif
echo "]}" >> $SCDIR/scan.sarif
cat "$SCDIR/runs.sarif" >> "$SCDIR/scan.sarif"
fi
echo "]}" >> "$SCDIR/scan.sarif"
echo "Created $SCDIR/scan.sarif"