screwdriver-api 8.0.180 → 8.0.182

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.180",
+  "version": "8.0.182",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/builds/helper/updateBuild.js

@@ -6,7 +6,7 @@ const merge = require('lodash.mergewith');
 const isEmpty = require('lodash.isempty');
 const { PR_JOB_NAME, PR_STAGE_NAME, STAGE_TEARDOWN_PATTERN } = require('screwdriver-data-schema').config.regex;
 const { getFullStageJobName } = require('../../helper');
-const { locker } = require('../../lock');
+const locker = require('../../lock');
 const { updateVirtualBuildSuccess, emitBuildStatusEvent, isFixedBuild } = require('../triggers/helpers');
 const TERMINAL_STATUSES = ['FAILURE', 'ABORTED', 'UNSTABLE', 'COLLAPSED'];
 const FINISHED_STATUSES = ['SUCCESS', ...TERMINAL_STATUSES];
@@ -459,8 +459,16 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
     let stageBuild;
     const isStageTeardown = STAGE_TEARDOWN_PATTERN.test(job.name);
     let stageBuildHasFailure = false;
+    let stageLock;
+    let stageResource;
 
     if (stage) {
+        stageResource = `event:${event.id}:stage:${stage.id}`;
+        try {
+            stageLock = await locker.lock(stageResource);
+        } catch (err) {
+            stageLock = null;
+        }
         stageBuild = await stageBuildFactory.get({
             stageId: stage.id,
             eventId: newEvent.id
@@ -534,6 +542,13 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
             }
         }
     }
+    if (stageResource) {
+        try {
+            await locker.unlock(stageLock, stageResource);
+        } catch (err) {
+            // ignore unlock errors for parity with lock helper behavior
+        }
+    }
 
     // update event status
     const latestBuilds = await newEvent.getBuilds();

package/plugins/pipelines/badge.js

@@ -22,24 +22,24 @@ module.exports = config => ({
             const { pipelineFactory, eventFactory } = request.server.app;
             const pipelineId = request.params.id;
             const { statusColor } = config;
-            const badgeConfig = {
-                statusColor
-            };
             const contentType = 'image/svg+xml;charset=utf-8';
+            let label;
 
             try {
                 // Get pipeline
                 const pipeline = await pipelineFactory.get(pipelineId);
 
                 if (!pipeline) {
-                    return h.response(getPipelineBadge(badgeConfig)).header('Content-Type', contentType);
+                    return h.response(getPipelineBadge({ statusColor })).header('Content-Type', contentType);
                 }
 
+                label = pipeline.name;
+
                 // Get latest pipeline events
                 const latestEvents = await eventFactory.getPipelineTypeBuildEvents(pipelineId);
 
                 if (!latestEvents || Object.keys(latestEvents).length === 0) {
-                    return h.response(getPipelineBadge(badgeConfig)).header('Content-Type', contentType);
+                    return h.response(getPipelineBadge({ statusColor, label })).header('Content-Type', contentType);
                 }
 
                 // Only care about latest
@@ -47,26 +47,19 @@ module.exports = config => ({
                 const builds = await lastEvent.getBuilds({ readOnly: true, sortBy: 'id', sort: 'descending' });
 
                 if (!builds || builds.length < 1) {
-                    return h.response(getPipelineBadge(badgeConfig)).header('Content-Type', contentType);
+                    return h.response(getPipelineBadge({ statusColor, label })).header('Content-Type', contentType);
                 }
 
                 // Convert build statuses
                 const buildsStatus = builds.map(build => build.status.toLowerCase());
 
                 return h
-                    .response(
-                        getPipelineBadge(
-                            Object.assign(badgeConfig, {
-                                buildsStatus,
-                                label: pipeline.name
-                            })
-                        )
-                    )
+                    .response(getPipelineBadge({ statusColor, label, buildsStatus }))
                     .header('Content-Type', contentType);
             } catch (err) {
                 logger.error(`Failed to get badge for pipeline:${pipelineId}: ${err.message}`);
 
-                return h.response(getPipelineBadge(badgeConfig));
+                return h.response(getPipelineBadge({ statusColor, label }));
             }
         },
         validate: {

package/plugins/pipelines/jobBadge.js

@@ -3,6 +3,7 @@
 const joi = require('joi');
 const schema = require('screwdriver-data-schema');
 const idSchema = schema.models.pipeline.base.extract('id');
+const logger = require('screwdriver-logger');
 const { getJobBadge } = require('./helper');
 
 module.exports = config => ({
@@ -22,61 +23,55 @@ module.exports = config => ({
             const { pipelineFactory } = request.server.app;
             const { id, jobName } = request.params;
             const { statusColor } = config;
-            const badgeConfig = {
-                statusColor
-            };
             const contentType = 'image/svg+xml;charset=utf-8';
+            let label;
 
-            return Promise.all([
-                jobFactory.get({
-                    pipelineId: id,
-                    name: jobName
-                }),
-                pipelineFactory.get(id)
-            ])
-                .then(([job, pipeline]) => {
-                    if (!job) {
-                        return h.response(getJobBadge(badgeConfig)).header('Content-Type', contentType);
-                    }
+            try {
+                const [job, pipeline] = await Promise.all([
+                    jobFactory.get({
+                        pipelineId: id,
+                        name: jobName
+                    }),
+                    pipelineFactory.get(id)
+                ]);
+
+                if (!pipeline) {
+                    return h.response(getJobBadge({ statusColor })).header('Content-Type', contentType);
+                }
+
+                label = pipeline.name;
+
+                if (!job) {
+                    return h.response(getJobBadge({ statusColor, label })).header('Content-Type', contentType);
+                }
 
-                    if (job.state === 'DISABLED') {
-                        return h
-                            .response(
-                                getJobBadge(
-                                    Object.assign(badgeConfig, {
-                                        builds: [
-                                            {
-                                                status: 'DISABLED'
-                                            }
-                                        ],
-                                        label: `${pipeline.name}:${jobName}`
-                                    })
-                                )
-                            )
-                            .header('Content-Type', contentType);
+                label = `${pipeline.name}:${jobName}`;
+
+                if (job.state === 'DISABLED') {
+                    return h
+                        .response(
+                            getJobBadge({
+                                statusColor,
+                                label,
+                                builds: [{ status: 'DISABLED' }]
+                            })
+                        )
+                        .header('Content-Type', contentType);
+                }
+
+                const builds = await job.getBuilds({
+                    paginate: {
+                        page: 1,
+                        count: 1
                     }
+                });
 
-                    const listConfig = {
-                        paginate: {
-                            page: 1,
-                            count: 1
-                        }
-                    };
+                return h.response(getJobBadge({ statusColor, label, builds })).header('Content-Type', contentType);
+            } catch (err) {
+                logger.error(`Failed to get job badge for pipeline:${id}, job:${jobName}: ${err.message}`);
 
-                    return job.getBuilds(listConfig).then(builds => {
-                        return h
-                            .response(
-                                getJobBadge(
-                                    Object.assign(badgeConfig, {
-                                        builds,
-                                        label: `${pipeline.name}:${jobName}`
-                                    })
-                                )
-                            )
-                            .header('Content-Type', contentType);
-                    });
-                })
-                .catch(() => h.response(getJobBadge(badgeConfig)));
+                return h.response(getJobBadge({ statusColor, label })).header('Content-Type', contentType);
+            }
         },
         validate: {
             params: joi.object({