screwdriver-api 8.0.144 → 8.0.146

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.144",
+  "version": "8.0.146",
   "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);

package/plugins/webhooks/helper.js

@@ -1413,77 +1413,80 @@ async function startHookEvent(request, h, webhookConfig) {
     const { type, hookId, username, scmContext, ref, checkoutUrl, action, prNum } = webhookConfig;
 
     parsedHookId = hookId;
+    webhookConfig.requestCache = new Map();
 
     try {
-        // skipping checks
-        if (/\[(skip ci|ci skip)\]/.test(webhookConfig.lastCommitMessage)) {
-            skipMessage = 'Skipping due to the commit message: [skip ci]';
-        }
-
-        // if skip ci then don't return
-        if (action !== 'tag' && action !== 'release' && ignoreUser && ignoreUser.length !== 0 && !skipMessage) {
-            const commitAuthors =
-                Array.isArray(webhookConfig.commitAuthors) && webhookConfig.commitAuthors.length !== 0
-                    ? webhookConfig.commitAuthors
-                    : [username];
-            const validCommitAuthors = commitAuthors.filter(author => !ignoreUser.includes(author));
-
-            if (!validCommitAuthors.length) {
-                message = `Skipping because user ${username} is ignored`;
-                request.log(['webhook', hookId], message);
-
-                return h.response({ message }).code(204);
+        return scm.withRequestCache(webhookConfig.requestCache, async () => {
+            // skipping checks
+            if (/\[(skip ci|ci skip)\]/.test(webhookConfig.lastCommitMessage)) {
+                skipMessage = 'Skipping due to the commit message: [skip ci]';
             }
-        }
 
-        const token = await obtainScmToken({
-            pluginOptions: webhookConfig.pluginOptions,
-            userFactory,
-            username,
-            scmContext,
-            scm
-        });
+            // if skip ci then don't return
+            if (action !== 'tag' && action !== 'release' && ignoreUser && ignoreUser.length !== 0 && !skipMessage) {
+                const commitAuthors =
+                    Array.isArray(webhookConfig.commitAuthors) && webhookConfig.commitAuthors.length !== 0
+                        ? webhookConfig.commitAuthors
+                        : [username];
+                const validCommitAuthors = commitAuthors.filter(author => !ignoreUser.includes(author));
 
-        if (action !== 'release' && action !== 'tag') {
-            let scmUri;
+                if (!validCommitAuthors.length) {
+                    message = `Skipping because user ${username} is ignored`;
+                    request.log(['webhook', hookId], message);
 
-            if (type === 'pr') {
-                scmUri = await scm.parseUrl({ checkoutUrl, token, scmContext });
+                    return h.response({ message }).code(204);
+                }
             }
-            webhookConfig.changedFiles = await scm.getChangedFiles({
-                webhookConfig,
-                type,
-                token,
+
+            const token = await obtainScmToken({
+                pluginOptions: webhookConfig.pluginOptions,
+                userFactory,
+                username,
                 scmContext,
-                scmUri,
-                prNum
+                scm
             });
-            request.log(['webhook', hookId], `Changed files are ${webhookConfig.changedFiles}`);
-        } else {
-            // The payload has no sha when webhook event is tag or release, so we need to get it.
-            try {
-                webhookConfig.sha = await getCommitRefSha({
-                    scm,
+
+            if (action !== 'release' && action !== 'tag') {
+                let scmUri;
+
+                if (type === 'pr') {
+                    scmUri = await scm.parseUrl({ checkoutUrl, token, scmContext });
+                }
+                webhookConfig.changedFiles = await scm.getChangedFiles({
+                    webhookConfig,
+                    type,
                     token,
-                    ref,
-                    refType: 'tags',
-                    checkoutUrl,
-                    scmContext
+                    scmContext,
+                    scmUri,
+                    prNum
                 });
-            } catch (err) {
-                request.log(['webhook', hookId, 'getCommitRefSha'], err);
+                request.log(['webhook', hookId], `Changed files are ${webhookConfig.changedFiles}`);
+            } else {
+                // The payload has no sha when webhook event is tag or release, so we need to get it.
+                try {
+                    webhookConfig.sha = await getCommitRefSha({
+                        scm,
+                        token,
+                        ref,
+                        refType: 'tags',
+                        checkoutUrl,
+                        scmContext
+                    });
+                } catch (err) {
+                    request.log(['webhook', hookId, 'getCommitRefSha'], err);
 
-                // there is a possibility of scm.getCommitRefSha() is not implemented yet
-                return h.response({ message }).code(204);
+                    // there is a possibility of scm.getCommitRefSha() is not implemented yet
+                    return h.response({ message }).code(204);
+                }
             }
-        }
 
-        if (type === 'pr') {
-            // disregard skip ci for pull request events
-            return pullRequestEvent(webhookConfig.pluginOptions, request, h, webhookConfig, token);
-        }
+            if (type === 'pr') {
+                // disregard skip ci for pull request events
+                return pullRequestEvent(webhookConfig.pluginOptions, request, h, webhookConfig, token);
+            }
 
-        return pushEvent(request, h, webhookConfig, skipMessage, token);
+            return pushEvent(request, h, webhookConfig, skipMessage, token);
+        });
     } catch (err) {
         logger.error(`[${parsedHookId}]: ${err}`);