From 077157f15f4885ebafe1ef7e7b50b276147b4e1d Mon Sep 17 00:00:00 2001 From: Ruud Senden <8635138+rsenden@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:09:11 +0200 Subject: [PATCH] fix: `fcli fod action run *-sast-report`: Warn instead of fail if scan summary is not (yet) available from FoD --- .../com/fortify/cli/fod/actions/zip/github-sast-report.yaml | 2 ++ .../com/fortify/cli/fod/actions/zip/gitlab-sast-report.yaml | 2 ++ .../com/fortify/cli/fod/actions/zip/sarif-sast-report.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/github-sast-report.yaml b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/github-sast-report.yaml index 585b9862b0..b4c7f6f01e 100644 --- a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/github-sast-report.yaml +++ b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/github-sast-report.yaml @@ -41,6 +41,8 @@ steps: - name: staticScanSummary uri: /api/v3/scans/${parameters.release.currentStaticScanId}/summary if: ${parameters.release.currentStaticScanId!=null} + onFail: + - warn: Unable to load static scan summary, some scan metadata may be missing from the report - progress: Processing issue data - requests: - name: issues diff --git a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/gitlab-sast-report.yaml b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/gitlab-sast-report.yaml index 26b530ca86..0e75cf060c 100644 --- a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/gitlab-sast-report.yaml +++ b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/gitlab-sast-report.yaml @@ -27,6 +27,8 @@ steps: - name: staticScanSummary uri: /api/v3/scans/${parameters.release.currentStaticScanId}/summary if: ${parameters.release.currentStaticScanId!=null} + onFail: + - warn: Unable to load static scan summary, some scan metadata may be missing from the report - progress: Processing issue data - requests: - name: issues diff --git a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/sarif-sast-report.yaml b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/sarif-sast-report.yaml index 529340c79d..c4678426a0 100644 --- a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/sarif-sast-report.yaml +++ b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/sarif-sast-report.yaml @@ -43,6 +43,8 @@ steps: - name: staticScanSummary uri: /api/v3/scans/${parameters.release.currentStaticScanId}/summary if: ${parameters.release.currentStaticScanId!=null} + onFail: + - warn: Unable to load static scan summary, some scan metadata may be missing from the report - progress: Processing issue data - requests: - name: issues