screwdriver-api 8.0.53 → 8.0.55

package/package.json

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

package/plugins/events/stopBuilds.js

@@ -7,6 +7,7 @@ const joi = require('joi');
 const schema = require('screwdriver-data-schema');
 const getSchema = schema.models.event.get;
 const idSchema = schema.models.event.base.extract('id');
+const { deriveEventStatusFromBuildStatuses } = require('../builds/helper/updateBuild');
 
 module.exports = () => ({
     method: 'PUT',
@@ -78,6 +79,7 @@ module.exports = () => ({
             // User has good permissions, get event builds
             const builds = await event.getBuilds();
             const toUpdate = [];
+            const updatedBuilds = [];
 
             // Update endtime and stop running builds
             // Note: COLLAPSED builds will never run
@@ -90,10 +92,18 @@ module.exports = () => ({
                     b.statusMessage = `Aborted by ${username}`;
 
                     toUpdate.push(b.update());
+                } else {
+                    updatedBuilds.push(b);
                 }
             });
+            updatedBuilds.push(...(await Promise.all(toUpdate)));
 
-            await Promise.all(toUpdate);
+            const newEventStatus = deriveEventStatusFromBuildStatuses(updatedBuilds);
+
+            if (newEventStatus && event.status !== newEventStatus) {
+                event.status = newEventStatus;
+                await event.update();
+            }
 
             // everything succeeded, inform the user
             const location = urlLib.format({

package/plugins/webhooks/index.js

@@ -69,31 +69,17 @@ const webhooksPlugin = {
                     const { executor, queueWebhookEnabled } = queueWebhook;
                     const message = 'Unable to process this kind of event';
                     let hookId;
-                    let webhookSettings;
 
                     try {
-                        const scmContexts = await scm.getScmContexts();
-
-                        scmContexts.forEach(scmContext => {
-                            if (pluginOptions[scmContext]) {
-                                webhookSettings = pluginOptions[scmContext];
-                            }
-                        });
-
-                        if (!webhookSettings) {
-                            logger.error(`No webhook settings found for scm context: ${scmContexts.join(', ')}`);
-                            throw boom.internal();
-                        }
-
                         let size = 0;
                         let data = '';
 
                         for await (const chunk of request.payload) {
                             size += chunk.length;
                             data += chunk;
-                            if (size > (webhookSettings.maxBytes || DEFAULT_MAX_BYTES)) {
+                            if (size > DEFAULT_MAX_BYTES) {
                                 throw boom.entityTooLarge(
-                                    `Payload size exceeds the maximum limit of ${webhookSettings.maxBytes || DEFAULT_MAX_BYTES} bytes`
+                                    `Payload size exceeds the maximum limit of ${DEFAULT_MAX_BYTES} bytes`
                                 );
                             }
                         }
@@ -113,6 +99,13 @@ const webhooksPlugin = {
                             return h.response({ message }).code(204);
                         }
 
+                        const webhookSettings = pluginOptions[parsed.scmContext];
+
+                        if (!webhookSettings) {
+                            logger.error(`No webhook settings found for scm context: ${parsed.scmContext}`);
+                            throw boom.internal();
+                        }
+
                         parsed.pluginOptions = webhookSettings;
 
                         const { type } = parsed;