screwdriver-coverage-sonar 4.1.0 → 4.1.2

package/index.js

@@ -45,14 +45,15 @@ class CoverageSonar extends CoverageBase {
             'Invalid config for sonar coverage plugin'
         );
 
-        this.sdCoverageAuthUrl = `${config.sdApiUrl}/v4/coverage/token`;
-        this.adminToken = config.adminToken;
-        this.sonarHost = config.sonarHost;
-        this.sonarEnterprise = config.sonarEnterprise;
-        this.sonarGitAppName = config.sonarGitAppName;
+        // use this.config for default values
+        this.sdCoverageAuthUrl = `${this.config.sdApiUrl}/v4/coverage/token`;
+        this.adminToken = this.config.adminToken;
+        this.sonarHost = this.config.sonarHost;
+        this.sonarEnterprise = this.config.sonarEnterprise;
+        this.sonarGitAppName = this.config.sonarGitAppName;
 
         this.uploadCommands = COMMANDS.replace('$SD_SONAR_HOST', this.sonarHost)
-            .replace('$SD_UI_URL', config.sdUiUrl)
+            .replace('$SD_UI_URL', this.config.sdUiUrl)
             .replace('$SD_SONAR_ENTERPRISE', this.sonarEnterprise)
             .split('\n');
 
@@ -116,27 +117,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.1.0",
+  "version": "4.1.2",
   "description": "SonarQube implementation of the coverage-base class",
   "main": "index.js",
   "scripts": {