screwdriver-api 4.1.200 → 4.1.201

package/package.json

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

package/plugins/builds/index.js

@@ -530,7 +530,7 @@ async function handleNewBuild({ done, hasFailure, newBuild, jobName, pipelineId
         }
 
         // If all join builds finished successfully and it's clear that a new build has not been started before, start new build
-        if ([ 'CREATED', null, undefined ].includes(newBuild.status)) {
+        if (['CREATED', null, undefined].includes(newBuild.status)) {
             newBuild.status = 'QUEUED';
             const queuedBuild = await newBuild.update();
 
@@ -1114,7 +1114,7 @@ const buildsPlugin = {
             tokenRoute(),
             metricsRoute(),
             artifactGetRoute(options),
-            artifactUnzipRoute(),
+            artifactUnzipRoute()
         ]);
     }
 };

package/plugins/pipelines/create.js

@@ -90,9 +90,12 @@ module.exports = () => ({
 
                 await defaultCollection.update();
             }
+
+            const results = await pipeline.sync();
+
             // check if pipeline has deploy key annotation then create secrets
-            const deployKeyAnnotation = pipeline.annotations && pipeline.annotations[ANNOTATION_USE_DEPLOY_KEY]
-      
+            const deployKeyAnnotation = pipeline.annotations && pipeline.annotations[ANNOTATION_USE_DEPLOY_KEY];
+
             if (autoKeysGeneration || deployKeyAnnotation) {
                 const privateDeployKey = await pipelineFactory.scm.addDeployKey({
                     scmContext,
@@ -109,8 +112,6 @@ module.exports = () => ({
                 });
             }
 
-            const results = await pipeline.sync();
-
             await pipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`);
 
             const location = urlLib.format({

package/plugins/pipelines/update.js

@@ -141,25 +141,32 @@ module.exports = () => ({
             // update pipeline
             const updatedPipeline = await oldPipeline.update();
 
+            await updatedPipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`);
+
+            const result = await updatedPipeline.sync();
+
             // check if pipeline has deploy key annotation then create secrets
-            const deployKeyAnnotation = oldPipeline.annotations && oldPipeline.annotations[ANNOTATION_USE_DEPLOY_KEY]
+            // sync needs to happen before checking annotations
+            const deployKeyAnnotation =
+                updatedPipeline.annotations && updatedPipeline.annotations[ANNOTATION_USE_DEPLOY_KEY];
 
             if (deployKeyAnnotation) {
                 const deploySecret = await secretFactory.get({
-                    pipelineId: oldPipeline.id,
-                    name: deployKeySecret,
-                })
+                    pipelineId: updatedPipeline.id,
+                    name: deployKeySecret
+                });
+                // create only secret doesn't exist already
 
                 if (!deploySecret) {
                     const privateDeployKey = await pipelineFactory.scm.addDeployKey({
-                        scmContext: oldPipeline.scmContext,
+                        scmContext: updatedPipeline.scmContext,
                         checkoutUrl: formattedCheckoutUrl,
                         token
                     });
                     const privateDeployKeyB64 = Buffer.from(privateDeployKey).toString('base64');
 
                     await secretFactory.create({
-                        pipelineId: oldPipeline.id,
+                        pipelineId: updatedPipeline.id,
                         name: deployKeySecret,
                         value: privateDeployKeyB64,
                         allowInPR: true
@@ -167,10 +174,6 @@ module.exports = () => ({
                 }
             }
 
-            await updatedPipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`);
-
-            const result = await updatedPipeline.sync();
-
             return h.response(result.toJson()).code(200);
         },
         validate: {

package/plugins/processHooks/index.js

@@ -13,7 +13,7 @@ const { startHookEvent } = require('../webhooks/helper');
  */
 const processHooksPlugin = {
     name: 'processHooks',
-    async register(server, options) {
+    async register(server) {
         server.route({
             method: 'POST',
             path: '/processHooks',

package/plugins/webhooks/helper.js

@@ -1171,7 +1171,13 @@ async function startHookEvent(request, h, webhookConfig) {
             }
         }
 
-        const token = await obtainScmToken({ pluginOptions: webhookConfig.pluginOptions, userFactory, username, scmContext, scm });
+        const token = await obtainScmToken({
+            pluginOptions: webhookConfig.pluginOptions,
+            userFactory,
+            username,
+            scmContext,
+            scm
+        });
 
         if (action !== 'release' && action !== 'tag') {
             let scmUri;

package/plugins/webhooks/index.js

@@ -65,7 +65,7 @@ const webhooksPlugin = {
                     const { pipelineFactory, queueWebhook } = request.server.app;
                     const { scm } = pipelineFactory;
                     const { executor, queueWebhookEnabled } = queueWebhook;
-                    let message = 'Unable to process this kind of event';
+                    const message = 'Unable to process this kind of event';
                     let hookId;
 
                     try {
@@ -79,6 +79,7 @@ const webhooksPlugin = {
                         parsed.pluginOptions = pluginOptions;
 
                         const { type } = parsed;
+
                         hookId = parsed.hookId;
 
                         request.log(['webhook', hookId], `Received event type ${type}`);
@@ -92,14 +93,13 @@ const webhooksPlugin = {
                                 return await executor.enqueueWebhook(parsed);
                             } catch (err) {
                                 // if enqueueWebhook is not implemented, an event starts without enqueuing
-                                if (err.message != 'Not implemented') {
+                                if (err.message !== 'Not implemented') {
                                     throw err;
                                 }
                             }
                         }
 
                         return await startHookEvent(request, h, parsed);
-
                     } catch (err) {
                         logger.error(`[${hookId}]: ${err}`);