Commit 922cdb8e authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '48-rename-sonar_url-to-sonar_host_url' into 'main' 

Resolve "Rename SONAR_URL to SONAR_HOST_URL"

Closes #48

See merge request to-be-continuous/defectdojo!74
parents 0cb7fc94 01abb12a

README.md

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ SonarQube is specific: contrary to other jobs, sonar job does not generate any a 


In order to launch SonarQube HTML-report generation, the following variables must be set:



- SONAR_URL (used by sonar template)

- SONAR_HOST_URL (used by sonar template)

- SONAR_TOKEN (used by sonar template)

- DEFECTDOJO_SONARQUBE_APPLICATION

- DEFECTDOJO_SONARQUBE_PROJECT_KEY
@@ -150,7 +150,7 @@ The following command is executed: 


```yaml

sonar-report \

--sonarurl="${SONAR_URL}" \

--sonarurl="${SONAR_HOST_URL}" \

--sonarcomponent="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

--project="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

--application="${DEFECTDOJO_SONARQUBE_APPLICATION}" \

templates/gitlab-ci-defectdojo.yml

+3 −3
Original line number Diff line number Diff line
@@ -297,11 +297,11 @@ variables: 
      log_warn "\$SONAR_AUTH_TOKEN variable detected: use \$SONAR_TOKEN instead (see doc)"

      export SONAR_TOKEN="$SONAR_AUTH_TOKEN"

    fi

    if [ -n "${SONAR_URL}" ] && [ -n "${SONAR_TOKEN}" ] && [ -n "${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" ] && [ -n "${DEFECTDOJO_SONARQUBE_APPLICATION}" ]; then

    if [ -n "${SONAR_HOST_URL:-$SONAR_URL}" ] && [ -n "${SONAR_TOKEN}" ] && [ -n "${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" ] && [ -n "${DEFECTDOJO_SONARQUBE_APPLICATION}" ]; then

      sonar_report="sonar-report.html"

      log_info "sonar-report will call ${SONAR_URL}/api/issues/search?componentKeys=${DEFECTDOJO_SONARQUBE_PROJECT_KEY}&ps=500&p=1&statuses=OPEN,CONFIRMED,REOPENED&resolutions=&s=STATUS&asc=no&types=VULNERABILITY"

      log_info "sonar-report will call ${SONAR_HOST_URL}/api/issues/search?componentKeys=${DEFECTDOJO_SONARQUBE_PROJECT_KEY}&ps=500&p=1&statuses=OPEN,CONFIRMED,REOPENED&resolutions=&s=STATUS&asc=no&types=VULNERABILITY"

      sonar-report \

      --sonarurl="${SONAR_URL}" \

      --sonarurl="${SONAR_HOST_URL:-$SONAR_URL}" \

      --sonarcomponent="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

      --project="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

      --application="${DEFECTDOJO_SONARQUBE_APPLICATION}" \