screwdriver-api 8.0.144 → 8.0.145

package/package.json

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

package/plugins/events/create.js

@@ -21,7 +21,7 @@ module.exports = () => ({
 
         handler: async (request, h) => {
             const { buildFactory, jobFactory, eventFactory, pipelineFactory, userFactory } = request.server.app;
-            const { buildId, causeMessage, creator, sha } = request.payload;
+            const { buildId, causeMessage, creator, sha, startAction } = request.payload;
             const { scmContext, username, scope } = request.auth.credentials;
             const { scm } = eventFactory;
             const { isValidToken } = request.server.plugins.pipelines;
@@ -67,8 +67,17 @@ module.exports = () => ({
                 payload.sha = sha;
             }
 
+            // If you specify a parentEventId in the payload, the metadata will be inherited.
+            // Therefore, you should not specify a parentEventId in the payload except when using RESTART.
+            // Prevents metadata from transferring when Start from a specific event
             if (parentEventId) {
-                payload.parentEventId = parentEventId;
+                // eslint-disable-next-line default-case
+                switch (startAction) {
+                    case 'RESTART_FROM_EVENT':
+                    case 'RESTART_FROM_BUILD': {
+                        payload.parentEventId = parentEventId;
+                    }
+                }
             }
 
             if (parentBuildId) {
@@ -240,27 +249,11 @@ module.exports = () => ({
 
             // If there is parentEvent, pass workflowGraph, meta and sha to payload
             // Skip PR, for PR builds, we should always start from latest commit
-            if (payload.parentEventId) {
+            if (parentEventId) {
                 const parentEvent = await eventFactory.get(parentEventId);
-                let mergedParameters = payload.meta.parameters || {};
 
                 payload.baseBranch = parentEvent.baseBranch || null;
 
-                // Merge parameters if they exist in the parent event and not in the payload
-                if (!payload.meta.parameters && parentEvent.meta && parentEvent.meta.parameters) {
-                    mergedParameters = parentEvent.meta.parameters;
-                }
-                delete payload.meta.parameters;
-
-                // Copy meta from parent event if payload.meta is empty except for the parameters
-                if (Object.keys(payload.meta).length === 0) {
-                    payload.meta = { ...parentEvent.meta };
-                }
-
-                if (Object.keys(mergedParameters).length > 0) {
-                    payload.meta.parameters = mergedParameters;
-                }
-
                 if (!prNum) {
                     payload.workflowGraph = parentEvent.workflowGraph;
                     payload.sha = parentEvent.sha;
@@ -269,6 +262,29 @@ module.exports = () => ({
                         payload.configPipelineSha = parentEvent.configPipelineSha;
                     }
                 }
+
+                // eslint-disable-next-line default-case
+                switch (startAction) {
+                    case 'RESTART_FROM_EVENT':
+                    case 'RESTART_FROM_BUILD': {
+                        let mergedParameters = payload.meta.parameters || {};
+
+                        // Merge parameters if they exist in the parent event and not in the payload
+                        if (!payload.meta.parameters && parentEvent.meta && parentEvent.meta.parameters) {
+                            mergedParameters = parentEvent.meta.parameters;
+                        }
+                        delete payload.meta.parameters;
+
+                        // Copy meta from parent event if payload.meta is empty except for the parameters
+                        if (Object.keys(payload.meta).length === 0) {
+                            payload.meta = { ...parentEvent.meta };
+                        }
+
+                        if (Object.keys(mergedParameters).length > 0) {
+                            payload.meta.parameters = mergedParameters;
+                        }
+                    }
+                }
             }
 
             const event = await createEvent(payload, request.server);