screwdriver-api 8.0.85 → 8.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.85",
+  "version": "8.0.87",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -90,6 +90,7 @@
     "badge-maker": "^3.3.1",
     "config": "^3.3.8",
     "dayjs": "^1.11.7",
+    "get-intrinsic": "1.3.0",
     "got": "^11.8.3",
     "hapi-auth-bearer-token": "^8.0.0",
     "hapi-auth-jwt2": "^10.4.0",

package/plugins/builds/index.js

@@ -198,8 +198,7 @@ async function triggerNextJobs(config, server) {
         let externalEvent = joinedPipeline.event;
 
         // This includes CREATED builds too
-        const groupEventBuilds =
-            externalEvent !== undefined ? await getBuildsForGroupEvent(externalEvent.groupEventId, buildFactory) : [];
+        const groupEventBuilds = await getBuildsForGroupEvent(currentEvent.groupEventId, buildFactory);
 
         // fetch builds created due to trigger
         if (externalEvent) {
@@ -269,7 +268,7 @@ async function triggerNextJobs(config, server) {
                 parentEventId: currentEvent.id,
                 startFrom: remoteTriggerName,
                 skipMessage: 'Skip bulk external builds creation', // Don't start builds in eventFactory.
-                groupEventId: null
+                groupEventId: currentEvent.groupEventId // groupEventId is the id of the first triggered event (use the upstream pipeline's in the downstream pipeline)
             };
 
             const buildsToRestart = buildsToRestartFilter(joinedPipeline, groupEventBuilds, currentEvent, currentBuild);
@@ -277,20 +276,7 @@ async function triggerNextJobs(config, server) {
 
             // Restart case
             if (isRestart) {
-                // 'joinedPipeline.event.id' is restart event, not group event.
-                const groupEvent = await eventFactory.get({ id: joinedPipeline.event.id });
-
-                externalEventConfig.groupEventId = groupEvent.groupEventId;
                 externalEventConfig.parentBuilds = buildsToRestart[0].parentBuilds;
-            } else {
-                const sameParentEvents = await getSameParentEvents({
-                    eventFactory,
-                    parentEventId: currentEvent.groupEventId,
-                    pipelineId: strToInt(joinedPipelineId)
-                });
-
-                externalEventConfig.groupEventId =
-                    sameParentEvents.length > 0 ? sameParentEvents[0].groupEventId : currentEvent.groupEventId;
             }
 
             try {

package/plugins/builds/triggers/helpers.js

@@ -167,6 +167,30 @@ function getExternalEvent(currentBuild, pipelineId, eventFactory) {
     return eventFactory.get(eventId);
 }
 
+/**
+ * Helper function to fetch external workflow belonging to group evnets
+ * @param {Event} currentEvent Event for current completed job
+ * @param {String} pipelineId Pipeline ID for next job to be triggered.
+ * @param {EventFactory} eventFactory Factory for querying event data store.
+ * @returns {Promise<Object>} Workflow graph of next job's pipeline
+ */
+async function getExternalWorkflowGraph(currentEvent, pipelineId, eventFactory) {
+    const groupExternalEvents = await eventFactory.list({
+        params: {
+            groupEventId: currentEvent.groupEventId,
+            pipelineId
+        },
+        sortBy: 'id',
+        sort: 'descending'
+    });
+
+    if (groupExternalEvents.length === 0) {
+        return null;
+    }
+
+    return groupExternalEvents[0].workflowGraph;
+}
+
 /**
  * Create event for downstream pipeline that need to be rebuilt
  * @param {Object} config Configuration object
@@ -1004,10 +1028,15 @@ async function createJoinObject(nextJobNames, current, eventFactory) {
             jobs = [];
 
             const externalEvent = pipelineObj.event || (await getExternalEvent(build, nextJobPipelineId, eventFactory));
+            const externalWorkflowGraph = externalEvent
+                ? externalEvent.workflowGraph
+                : await getExternalWorkflowGraph(event, nextJobPipelineId, eventFactory);
 
             if (externalEvent) {
                 pipelineObj.event = externalEvent;
-                jobs = workflowParser.getSrcForJoin(externalEvent.workflowGraph, { jobName: nextJobName });
+            }
+            if (externalWorkflowGraph) {
+                jobs = workflowParser.getSrcForJoin(externalWorkflowGraph, { jobName: nextJobName });
             }
         } else {
             jobs = workflowParser.getSrcForJoin(event.workflowGraph, { jobName });

package/plugins/webhooks/index.js

@@ -77,15 +77,7 @@ const webhooksPlugin = {
                         }
 
                         const data = Buffer.concat(chunks).toString();
-                        let parsedPayload;
-
-                        try {
-                            parsedPayload = JSON.parse(data);
-                        } catch (err) {
-                            throw boom.badData('Cannot parse payload');
-                        }
-
-                        const parsed = await scm.parseHook(request.headers, parsedPayload);
+                        const parsed = await scm.parseHook(request.headers, data);
 
                         if (!parsed) {
                             // for all non-matching events or actions