screwdriver-coverage-sonar 4.0.0 → 4.1.1

package/commands.txt

@@ -10,8 +10,11 @@ if echo $SCM_URL | grep git@ > /dev/null 2>&1; then export SONAR_SCM_URL=`echo $
 if [ ! -z "$SD_SELF_SONAR_HOST" ]; then SCANNER_OPTION='"-Dsonar.host.url=$SD_SELF_SONAR_HOST" "-Dsonar.login=$SONAR_TOKEN" "-Dsonar.projectKey=$SD_SONAR_PROJECT_KEY" "-Dsonar.projectName=$SD_SONAR_PROJECT_NAME" "-Dsonar.projectVersion=$PROJECT_VERSION" "-Dsonar.links.scm=$SONAR_SCM_URL" "-Dsonar.links.ci=$SD_UI_URL/pipelines/$SD_PIPELINE_ID" "-Dsonar.scm.revision=$SD_BUILD_SHA" $SONAR_OPTIONS'; else SCANNER_OPTION='"-Dsonar.host.url=$SD_SONAR_HOST" "-Dsonar.login=$SONAR_TOKEN" "-Dsonar.projectKey=$SD_SONAR_PROJECT_KEY" "-Dsonar.projectName=$SD_SONAR_PROJECT_NAME" "-Dsonar.projectVersion=$PROJECT_VERSION" "-Dsonar.links.scm=$SONAR_SCM_URL" "-Dsonar.links.ci=$SD_UI_URL/pipelines/$SD_PIPELINE_ID" "-Dsonar.scm.revision=$SD_BUILD_SHA" $SONAR_OPTIONS'; fi
 SCANNER_PATH="/opt/sd/sonar-scanner/bin/sonar-scanner"
 if [ -s ${SCANNER_PATH} ] && [ -x ${SCANNER_PATH} ]; then eval $SCANNER_PATH $SCANNER_OPTION || true; exit 0; fi
-if [ `uname` = 'Darwin' ]; then TARGET_OS='macosx'; else TARGET_OS='linux'; fi
-SCANNER_PATH="/opt/sd/sonarscanner-cli-${TARGET_OS}/bin/sonar-scanner"
+OS="$(uname)"
+ARCH="$(uname -m)"
+if [ "$OS" = 'Darwin' ]; then TARGET_OS='macosx'; else TARGET_OS='linux'; fi
+if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then TARGET_ARCH='-arm64'; else TARGET_ARCH=''; fi
+SCANNER_PATH="/opt/sd/sonarscanner-cli-${TARGET_OS}${TARGET_ARCH}/bin/sonar-scanner"
 if [ -s ${SCANNER_PATH} ] && [ -x ${SCANNER_PATH} ]; then eval $SCANNER_PATH $SCANNER_OPTION || true; exit 0; fi
 if unzip -version > /dev/null 2>&1; then SD_UNZIP_CMD_WRAPPER="eval"; else SD_UNZIP_CMD_WRAPPER="sd-step exec --pkg-version 6.0 core/unzip"; fi
 export SD_UNZIP_CMD_WRAPPER

package/index.js

@@ -116,27 +116,40 @@ class CoverageSonar extends CoverageBase {
             method: 'GET',
             url: `${this.sonarHost}/api/alm_settings/get_binding?project=${componentId}`,
             username: this.adminToken
-        }).catch(() => {
-            // if binding does not exist, add it
-            logger.info(`Binding does not exist for Sonar project ${projectKey}, adding`);
+        })
+            .then(result => {
+                // if project name has been changed, update it
+                if (projectName && (!result.repository || result.repository !== projectName)) {
+                    throw new Error(`Repository name has been changed from ${result.repository} to ${projectName}!`);
+                }
 
-            if (!this.sonarEnterprise || !projectName) {
-                return Promise.resolve();
-            }
+                return result;
+            })
+            .catch(() => {
+                // if binding does not exist, add it
+                logger.info(`Binding does not exist for Sonar project ${projectKey}, adding`);
+
+                if (!this.sonarEnterprise || !projectName) {
+                    return Promise.resolve();
+                }
+
+                const parameters = `almSetting=${gitAppEncoded}&project=${componentId}&repository=${projectName}&summaryCommentEnabled=true&monorepo=false`;
 
-            const parameters = `almSetting=${gitAppEncoded}&project=${componentId}&repository=${projectName}&summaryCommentEnabled=true&monorepo=false`;
+                logger.info(`Configuring git app with following parameters, ${parameters}`);
 
-            return request({
-                method: 'POST',
-                url: `${this.sonarHost}/api/alm_settings/set_github_binding?${parameters}`,
-                username: this.adminToken
-            }).catch(error => {
-                // if cannot configure app, do not throw err
-                logger.error(`Failed to configure Git App ${gitApp} for Sonar project ${projectKey}: ${error.message}`);
+                return request({
+                    method: 'POST',
+                    url: `${this.sonarHost}/api/alm_settings/set_github_binding?${parameters}`,
+                    username: this.adminToken
+                }).catch(error => {
+                    // if cannot configure app, do not throw err
+                    logger.error(
+                        `Failed to configure Git App ${gitApp} for Sonar project ${projectKey}: ${error.message}`
+                    );
 
-                return Promise.resolve();
+                    return Promise.resolve();
+                });
             });
-        });
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-coverage-sonar",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "SonarQube implementation of the coverage-base class",
   "main": "index.js",
   "scripts": {