screwdriver-coverage-sonar 4.1.1 → 4.2.0

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');
 
@@ -295,13 +296,20 @@ class CoverageSonar extends CoverageBase {
             const [projectScope, id] = projectKey.split(':');
             const projectName = projectScope === 'pipeline' ? pipelineName : `${pipelineName}:${jobName}`;
             const username = `user-${projectScope}-${id}`;
-
-            return {
+            const projectData = {
                 projectKey,
                 username,
                 projectName,
                 projectScope
             };
+
+            if (projectScope === 'pipeline') {
+                const componentId = encodeURIComponent(`pipeline:${id}`);
+
+                projectData.projectUrl = `${this.sonarHost}/dashboard?id=${componentId}`;
+            }
+
+            return projectData;
         }
 
         // Use user-configured scope; otherwise figure out default scope: pipeline scope for enterprise edition, job scope for everything else
@@ -309,11 +317,15 @@ class CoverageSonar extends CoverageBase {
         const coverageScope = userScope || (enterpriseEnabled ? 'pipeline' : 'job');
 
         if (coverageScope === 'pipeline') {
+            const componentId = encodeURIComponent(`pipeline:${pipelineId}`);
+            const projectUrl = `${this.sonarHost}/dashboard?id=${componentId}`;
+
             return {
                 projectKey: `pipeline:${pipelineId}`,
                 projectName: pipelineName,
                 username: `user-pipeline-${pipelineId}`,
-                projectScope: coverageScope
+                projectScope: coverageScope,
+                projectUrl
             };
         }
 

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "screwdriver-coverage-sonar",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "SonarQube implementation of the coverage-base class",
   "main": "index.js",
   "scripts": {
     "pretest": "eslint .",
-    "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true"
+    "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true",
+    "test-debug": "mocha --inspect-brk ./test/**/*.js"
   },
   "repository": {
     "type": "git",