screwdriver-api 8.0.36 → 8.0.38

package/package.json

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

package/plugins/events/create.js

@@ -153,7 +153,11 @@ module.exports = () => ({
 
             // Update admins
             if (!prNum) {
-                await updateAdmins({ permissions, pipeline, user });
+                try {
+                    await updateAdmins({ permissions, pipeline, user });
+                } catch (err) {
+                    throw boom.boomify(err, { statusCode: err.statusCode });
+                }
             }
 
             // Get scmConfig
@@ -171,16 +175,21 @@ module.exports = () => ({
                 payload.prNum = String(prNum);
                 payload.type = 'pr';
 
-                const [files, prInfo] = await Promise.all([
-                    scm.getChangedFiles({
-                        webhookConfig: null,
-                        type: 'pr',
-                        ...scmConfig
-                    }),
-                    scm.getPrInfo(scmConfig)
-                ]).catch(err => {
+                let files;
+                let prInfo;
+
+                try {
+                    [files, prInfo] = await Promise.all([
+                        scm.getChangedFiles({
+                            webhookConfig: null,
+                            type: 'pr',
+                            ...scmConfig
+                        }),
+                        scm.getPrInfo(scmConfig)
+                    ]);
+                } catch (err) {
                     throw boom.boomify(err, { statusCode: err.statusCode });
-                });
+                }
 
                 if (files && files.length) {
                     payload.changedFiles = files;
@@ -196,14 +205,17 @@ module.exports = () => ({
                     restrictPR = pipeline.annotations[ANNOT_RESTRICT_PR];
                 }
 
-                // PR author should be able to rerun their own PR build if restrictPR is not on
                 if (restrictPR !== 'none' || prInfo.username !== username) {
                     // Remove user from admins
-                    await updateAdmins({
-                        permissions,
-                        pipeline,
-                        user
-                    });
+                    try {
+                        await updateAdmins({
+                            permissions,
+                            pipeline,
+                            user
+                        });
+                    } catch (err) {
+                        throw boom.boomify(err, { statusCode: err.statusCode });
+                    }
                 }
             }
 

package/plugins/webhooks/helper.js

@@ -778,11 +778,17 @@ async function createPrClosedEvent(options, request) {
             try {
                 const b = await p.branch;
                 let eventConfig = {};
-
-                let configPipelineSha = '';
+                const token = await p.token;
+                const pScmConfig = {
+                    scmUri: p.scmUri,
+                    token,
+                    scmRepo: p.scmRepo,
+                    scmContext: scmConfig.scmContext
+                };
+                let latestPipelineSha = '';
 
                 try {
-                    configPipelineSha = await pipelineFactory.scm.getCommitSha(scmConfig);
+                    latestPipelineSha = await pipelineFactory.scm.getCommitSha(pScmConfig);
                 } catch (err) {
                     if (err.status >= 500) {
                         throw err;
@@ -808,14 +814,14 @@ async function createPrClosedEvent(options, request) {
                     webhooks: true,
                     username,
                     scmContext: scmConfig.scmContext,
-                    sha,
+                    sha: latestPipelineSha || sha,
                     startFrom: isPipelineBranch ? startFrom : `${startFrom}:${branch}`,
                     changedFiles,
                     causeMessage: isPipelineBranch ? causeMessage : `${causeMessage} on branch ${branch}`,
                     ref,
                     baseBranch: branch,
                     meta: createMeta(options),
-                    configPipelineSha,
+                    configPipelineSha: latestPipelineSha,
                     prNum,
                     chainPR: resolvedChainPR
                 };