diff --git a/.github/workflows/trivy-repo-scan.yml b/.github/workflows/trivy-repo-scan.yml index e1aa104ae..d44ebff18 100644 --- a/.github/workflows/trivy-repo-scan.yml +++ b/.github/workflows/trivy-repo-scan.yml @@ -58,18 +58,37 @@ jobs: name: "trivy-repo-full-results.json" path: './trivy-repo-full-results.json' - - name: Import Trivy Findings to DefectDojo - uses: portswigger-cloud/defectdojo-import-scan@v1 - with: - defectdojo-url: ${{ secrets.DEFECTOJO_URL }} - defectdojo-username: ${{ secrets.DEFECTOJO_USERNAME }} - defectdojo-password: ${{ secrets.DEFECTOJO_PASSWORD }} - defectdojo-product-type: OPENSRP - defectdojo-product: OpenSRP-Server-Web - defectdojo-environment-type: Test - defectdojo-scan-type: Trivy Scan - defectdojo-engagement-name: Github Actions Initiated Trivy SAST Scan - scan-results-file-name: trivy-repo-full-results.json +# - name: Import Trivy Findings to DefectDojo +# uses: portswigger-cloud/defectdojo-import-scan@v1 +# with: +# defectdojo-url: ${{ secrets.DEFECTOJO_URL }} +# defectdojo-username: ${{ secrets.DEFECTOJO_USERNAME }} +# defectdojo-password: ${{ secrets.DEFECTOJO_PASSWORD }} +# defectdojo-product-type: OPENSRP +# defectdojo-product: OpenSRP-Server-Web +# defectdojo-environment-type: Test +# defectdojo-scan-type: Trivy Scan +# defectdojo-engagement-name: Github Actions Initiated Trivy SAST Scan +# scan-results-file-name: trivy-repo-full-results.json + +# - name: Export Trivy report to DefectDojo +# uses: defectdojo/defectdojo-action@v1 +# with: +# api_url: ${{ secrets.DEFECTDOJO_API_URL }} +# api_key: ${{ secrets.DEFECTDOJO_API_KEY }} +# engagement_id: 45 +# test_id: 247 +# file: './trivy-repo-full-results.json' + + - name: Export report to DefectDojo + run: | + curl -X POST -H "Content-Type: application/json" \ + -H "Authorization: Token ${DEFECTDOJO_API_KEY}" \ + -d @trivy-repo-full-results.json \ + "${DEFECTDOJO_API_URL}/api/v2/engagements/45/tests/247/import-scan/" + env: + DEFECTDOJO_API_URL: ${{ secrets.DEFECTDOJO_API_URL }} + DEFECTDOJO_API_KEY: ${{ secrets.DEFECTDOJO_API_KEY }} - name: Create summary of trivy issues on Repository Full scan run: |