From be39e19eef2f446451521ca258dd6a759d322f0f Mon Sep 17 00:00:00 2001 From: Assaf Attias <49212512+attiasas@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:04:06 +0300 Subject: [PATCH] Update CLA assistant (#193) --- .github/workflows/cla.yml | 2 +- jas/common.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 38183d2d..b3419053 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -19,7 +19,7 @@ jobs: - name: "CLA Assistant" if: ${{ steps.sign-or-recheck.outputs.match != '' || github.event_name == 'pull_request_target' }} # Alpha Release - uses: cla-assistant/github-action@v2.3.0 + uses: cla-assistant/github-action@v2.6.0 env: # Generated and maintained by GitHub GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/jas/common.go b/jas/common.go index 5acdb987..dc65cacf 100644 --- a/jas/common.go +++ b/jas/common.go @@ -33,7 +33,7 @@ import ( const ( NoServerUrlError = "To incorporate the ‘Advanced Security’ scans into the audit output make sure platform url is provided and valid (run 'jf c add' prior to 'jf audit' via CLI, or provide JF_URL via Frogbot)" - NoServerDetailsError = "Jfrog Server details are missing" + NoServerDetailsError = "jfrog Server details are missing" ) type JasScanner struct { @@ -53,6 +53,12 @@ func CreateJasScanner(jfrogAppsConfig *jfrogappsconfig.JFrogAppsConfig, serverDe return } if len(serverDetails.Url) == 0 { + if len(serverDetails.XrayUrl) != 0 { + log.Debug("Xray URL provided without platform URL") + } + if len(serverDetails.ArtifactoryUrl) != 0 { + log.Debug("Artifactory URL provided without platform URL") + } log.Warn(NoServerUrlError) return }