Fix from review

Author: alban-auzeill

.cirrus.yml

@@ -14,11 +14,7 @@ env:
   ARTIFACTORY_ACCESS_TOKEN: VAULT[development/artifactory/token/${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-private-reader access_token]
   DEVELOCITY_TOKEN: VAULT[development/kv/data/develocity data.token]
   DEVELOCITY_ACCESS_KEY: develocity.sonar.build=${DEVELOCITY_TOKEN}
-  # analysis on next
-  SONAR_HOST_URL: "https://next.sonarqube.com/sonarqube"
-  SONAR_TOKEN: VAULT[development/kv/data/next data.token]
   SONAR_PROJECT_KEY: "org.sonarsource.xml:xml"
-
   # Use bash (instead of sh on linux or cmd.exe on windows)
   CIRRUS_SHELL: bash
 
@@ -55,6 +51,9 @@ build_task:
     cpu: 2
     memory: 2G
   env:
+    # analysis on next
+    SONAR_TOKEN: VAULT[development/kv/data/next data.token]
+    SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
     SIGN_KEY: VAULT[development/kv/data/sign data.key]
     PGP_PASSPHRASE: VAULT[development/kv/data/sign data.passphrase]
     #allow deployment of pull request artifacts to repox
@@ -79,6 +78,9 @@ sonar_shadow_scan_and_issue_replication_task:
   env:
     SHADOW_ORGANIZATION: "sonarsource"
     SHADOW_PROJECT_KEY: "SonarSource_sonar-xml"
+    # to replicate issue states from next
+    SONAR_TOKEN: VAULT[development/kv/data/next data.token]
+    SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
     matrix:
       - name: "sonarcloud.io"
         SHADOW_SONAR_TOKEN: VAULT[development/kv/data/sonarcloud data.token]

shadow-scan-and-issue-replication.sh

@@ -2,36 +2,36 @@
 
 set -euo pipefail
 
-source cirrus-env BUILD
-. set_maven_build_version "$BUILD_NUMBER"
-
-echo
-echo "-- Build and analyze the project targeting a shadow SonarQube instance ---"
-
-mvn \
-  -Pcoverage \
-  -Dmaven.test.redirectTestOutputToFile=false \
-  -Dsonar.host.url="${SHADOW_SONAR_HOST_URL}" \
-  -Dsonar.token="${SHADOW_SONAR_TOKEN}" \
-  -Dsonar.organization="${SHADOW_ORGANIZATION}" \
-  -Dsonar.projectKey="${SHADOW_PROJECT_KEY}" \
-  -Dsonar.analysis.buildNumber="${BUILD_NUMBER}" \
-  -Dsonar.analysis.repository="${GITHUB_REPO}" \
-  --batch-mode --errors --show-version \
-  verify sonar:sonar
-
-echo
-echo "-- Issue replication between two SonarQube instances ---"
-
-mkdir -p target/libs
-
 # IRIS: Issue Replication for Sonarqube
-IRIS_JAR_URL="${ARTIFACTORY_URL}/sonarsource-private-releases/com/sonarsource/iris/iris/\[RELEASE\]/iris-\[RELEASE\]-jar-with-dependencies.jar"
+export IRIS_JAR_URL="${ARTIFACTORY_URL}/sonarsource-private-releases/com/sonarsource/iris/iris/\[RELEASE\]/iris-\[RELEASE\]-jar-with-dependencies.jar"
+export IRIS_JAR_PATH="target/libs/iris.jar"
+
+function build_and_analyze_the_project() {
+  echo
+  echo "===== Build and analyze the project targeting a shadow SonarQube instance"
+  mvn \
+    -Pcoverage \
+    -Dmaven.test.redirectTestOutputToFile=false \
+    -Dsonar.host.url="${SHADOW_SONAR_HOST_URL}" \
+    -Dsonar.token="${SHADOW_SONAR_TOKEN}" \
+    -Dsonar.organization="${SHADOW_ORGANIZATION}" \
+    -Dsonar.projectKey="${SHADOW_PROJECT_KEY}" \
+    -Dsonar.analysis.buildNumber="${BUILD_NUMBER}" \
+    -Dsonar.analysis.repository="${GITHUB_REPO}" \
+    --batch-mode --errors --show-version \
+    verify sonar:sonar
+}
 
-curl --silent --fail-with-body --location --header "Authorization: Bearer ${ARTIFACTORY_PRIVATE_PASSWORD}" \
-    --output "target/libs/iris.jar" "${IRIS_JAR_URL}"
+function download_iris() {
+  echo
+  echo "===== Download ${IRIS_JAR_URL}"
+  mkdir -p target/libs
+  curl --silent --fail-with-body --location --header "Authorization: Bearer ${ARTIFACTORY_PRIVATE_PASSWORD}" \
+      --output "${IRIS_JAR_PATH}" "${IRIS_JAR_URL}"
+}
 
-for DRY_RUN in true false; do
+function run_iris() {
+  local DRY_RUN="$1"
   java \
     -Diris.source.projectKey="${SONAR_PROJECT_KEY}" \
     -Diris.source.url="${SONAR_HOST_URL}" \
@@ -41,5 +41,30 @@ for DRY_RUN in true false; do
     -Diris.destination.url="${SHADOW_SONAR_HOST_URL}" \
     -Diris.destination.token="${SHADOW_SONAR_TOKEN}" \
     -Diris.dryrun="${DRY_RUN}" \
-    -jar "target/libs/iris.jar"
-done
+    -jar "${IRIS_JAR_PATH}"
+}
+
+function run_iris_with_and_without_dry_run() {
+  echo
+  echo "===== Execute IRIS as dry-run"
+  if run_iris true; then
+    echo "===== Successful IRIS execution as dry-run"
+    echo "===== Execute IRIS for real"
+    if run_iris false; then
+      echo "===== Successful IRIS execution for real"
+      return 0
+    else
+      echo "===== Failed IRIS execution for real"
+      return 1
+    fi
+  else
+    echo "===== Failed IRIS execution as dry-run"
+    return 1
+  fi
+}
+
+source cirrus-env BUILD
+. set_maven_build_version "$BUILD_NUMBER"
+build_and_analyze_the_project
+download_iris
+run_iris_with_and_without_dry_run