screwdriver-api 8.0.190 → 8.0.192

package/package.json

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

package/plugins/builds/helper/updateBuild.js

@@ -459,11 +459,11 @@ 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}`;
+        const stageResource = `event:${event.id}:stage:${stage.id}`;
+        let stageLock;
+
         try {
             stageLock = await locker.lock(stageResource);
         } catch (err) {
@@ -476,6 +476,11 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
 
         stageBuild = await updateStageBuildStatus({ stageBuild, newStatus: newBuild.status, job });
 
+        try {
+            await locker.unlock(stageLock, stageResource);
+        } catch (err) {
+            // ignore unlock errors for parity with lock helper behavior
+        }
         stageBuildHasFailure = TERMINAL_STATUSES.includes(stageBuild.status);
     }
 
@@ -497,6 +502,15 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
     // (if stage teardown build exists, and stageBuild.status is negative,
     // and there are no active stage builds, and teardown build is not started)
     if (stage && FINISHED_STATUSES.includes(newBuild.status) && !isStageTeardown) {
+        const stageResource = `event:${event.id}:stage:${stage.id}`;
+        let stageLock;
+
+        try {
+            stageLock = await locker.lock(stageResource);
+        } catch (err) {
+            stageLock = null;
+        }
+
         const stageTeardownName = getFullStageJobName({ stageName: stage.name, jobName: 'teardown' });
         const stageTeardownJob = await jobFactory.get({ pipelineId: pipeline.id, name: stageTeardownName });
         let stageTeardownBuild = await buildFactory.get({ eventId: newEvent.id, jobId: stageTeardownJob.id });
@@ -541,8 +555,7 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
                 }
             }
         }
-    }
-    if (stageResource) {
+
         try {
             await locker.unlock(stageLock, stageResource);
         } catch (err) {

package/plugins/pipelines/tokens/update.js

@@ -65,21 +65,16 @@ module.exports = () => ({
                         throw boom.conflict(`Token ${match.name} already exists`);
                     }
 
-                    let payloadOptions;
-
-                    if (request.payload && request.payload.options) {
-                        payloadOptions = request.payload.options;
-                    }
-
                     Object.keys(request.payload).forEach(key => {
                         if (key === 'options') {
-                            const hasResourceUpdates =
-                                payloadOptions.resources && Object.keys(payloadOptions.resources).length > 0;
+                            const payloadOptions = request.payload.options || {};
+                            const tokenOptions = token.options || {};
+                            const hasResourceUpdates = Object.keys(payloadOptions.resources || {}).length > 0;
 
                             token.options = {
-                                ...token.options,
+                                ...tokenOptions,
                                 ...payloadOptions,
-                                resources: hasResourceUpdates ? payloadOptions.resources : token.options.resources
+                                resources: hasResourceUpdates ? payloadOptions.resources : tokenOptions.resources || {}
                             };
                         } else {
                             token[key] = request.payload[key];

package/plugins/tokens/update.js

@@ -50,21 +50,18 @@ module.exports = () => ({
                             throw boom.conflict(`Token with name ${match.name} already exists`);
                         }
 
-                        let payloadOptions;
-
-                        if (request.payload && request.payload.options) {
-                            payloadOptions = request.payload.options;
-                        }
-
                         Object.keys(request.payload).forEach(key => {
                             if (key === 'options') {
-                                const hasResourceUpdates =
-                                    payloadOptions.resources && Object.keys(payloadOptions.resources).length > 0;
+                                const payloadOptions = request.payload.options || {};
+                                const tokenOptions = token.options || {};
+                                const hasResourceUpdates = Object.keys(payloadOptions.resources || {}).length > 0;
 
                                 token.options = {
-                                    ...token.options,
+                                    ...tokenOptions,
                                     ...payloadOptions,
-                                    resources: hasResourceUpdates ? payloadOptions.resources : token.options.resources
+                                    resources: hasResourceUpdates
+                                        ? payloadOptions.resources
+                                        : tokenOptions.resources || {}
                                 };
                             } else {
                                 token[key] = request.payload[key];