screwdriver-api 7.0.20 → 7.0.22

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.20",
+  "version": "7.0.22",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
     "pretest": "eslint . --quiet",
     "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 10000 --retries 1 --exit --allow-uncaught true --color true",
-    "test-debug": "mocha --inspect ./test/**/*.js",
+    "test-debug": "mocha --inspect-brk ./test/**/*.js",
     "start": "./bin/server",
     "debug": "node --nolazy ./bin/server",
     "profile": "node --prof ./bin/server",
@@ -105,7 +105,7 @@
     "screwdriver-config-parser": "^8.0.1",
     "screwdriver-coverage-bookend": "^2.0.0",
     "screwdriver-coverage-sonar": "^4.1.1",
-    "screwdriver-data-schema": "^22.9.3",
+    "screwdriver-data-schema": "^22.9.8",
     "screwdriver-datastore-sequelize": "^8.0.0",
     "screwdriver-executor-base": "^9.0.1",
     "screwdriver-executor-docker": "^6.0.0",

package/plugins/coverage/token.js

@@ -1,10 +1,11 @@
 'use strict';
 
 const boom = require('@hapi/boom');
-const COVERAGE_SCOPE_ANNOTATION = 'screwdriver.cd/coverageScope';
-
+const logger = require('screwdriver-logger');
 const CoveragePlugin = require('screwdriver-coverage-bookend');
 
+const COVERAGE_SCOPE_ANNOTATION = 'screwdriver.cd/coverageScope';
+
 module.exports = config => ({
     method: 'GET',
     path: '/coverage/token',
@@ -53,10 +54,11 @@ module.exports = config => ({
                         ? job.permutations[0].annotations[COVERAGE_SCOPE_ANNOTATION]
                         : null;
             }
+            let pipeline;
 
             // Get pipeline name
             if (pipelineId && (!projectName || projectName.includes('undefined'))) {
-                const pipeline = await pipelineFactory.get(pipelineId);
+                pipeline = await pipelineFactory.get(pipelineId);
 
                 if (!pipeline) {
                     throw boom.notFound(`Pipeline ${pipelineId} does not exist`);
@@ -80,6 +82,45 @@ module.exports = config => ({
 
                 const selfSonar = new CoveragePlugin(selfSonarConfig);
                 const data = await selfSonar.coveragePlugin.getAccessToken(tokenConfig);
+                const projectUrl = selfSonar.coveragePlugin.getProjectData(tokenConfig);
+
+                if (pipeline && projectUrl) {
+                    try {
+                        const pipelineSonarBadge = {
+                            defaultName: pipelineId,
+                            defaultUri: projectUrl
+                        };
+                        let shouldPipelineUpdate = true;
+
+                        if (
+                            pipeline.badges &&
+                            pipeline.badges.sonar &&
+                            pipeline.badges.sonar.defaultName === pipelineId &&
+                            pipeline.badges.sonar.defaultUri === projectUrl
+                        ) {
+                            shouldPipelineUpdate = false;
+                        }
+
+                        if (shouldPipelineUpdate) {
+                            if (pipeline.badges) {
+                                pipeline.badges.sonar = pipelineSonarBadge;
+                            } else {
+                                pipeline.badges = {
+                                    sonar: pipelineSonarBadge
+                                };
+                            }
+
+                            await pipeline.update();
+                            logger.info(
+                                `update pipeline:${pipeline.id}'s sonar badge with defaultName:${pipelineId}, defaultUri: ${projectUrl}`
+                            );
+                        }
+                    } catch (err) {
+                        logger.error(`Failed to update pipeline:${pipelineId}`, err);
+
+                        throw err;
+                    }
+                }
 
                 return h.response(data);
             }

package/plugins/pipelines/update.js

@@ -147,7 +147,16 @@ module.exports = () => ({
             }
 
             if (badges) {
-                oldPipeline.badges = { ...oldPipeline.badges, ...badges };
+                if (!oldPipeline.badges) {
+                    oldPipeline.badges = badges;
+                } else {
+                    Object.keys(oldPipeline.badges).forEach(badgeKey => {
+                        oldPipeline.badges[badgeKey] = {
+                            ...oldPipeline.badges[badgeKey],
+                            ...badges[badgeKey]
+                        };
+                    });
+                }
             }
 
             // update pipeline