screwdriver-api 7.0.122 → 7.0.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.122",
+  "version": "7.0.124",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -93,6 +93,7 @@
     "js-yaml": "^3.14.1",
     "jsonwebtoken": "^9.0.0",
     "license-checker": "^25.0.1",
+    "lodash": "^4.17.21",
     "lodash.mergewith": "^4.6.2",
     "ndjson": "^2.0.0",
     "node-env-file": "^0.1.8",

package/plugins/webhooks/helper.js

@@ -327,7 +327,6 @@ async function triggeredPipelines(
     };
 
     const pipelines = await pipelineFactory.list(listConfig);
-
     const pipelinesWithSubscribedRepos = await pipelineFactory.list(externalRepoSearchConfig);
 
     let pipelinesOnCommitBranch = [];
@@ -365,7 +364,43 @@ async function triggeredPipelines(
 
     const currentRepoPipelines = pipelinesOnCommitBranch.concat(pipelinesOnOtherBranch);
 
-    return currentRepoPipelines.concat(pipelinesWithSubscribedRepos);
+    if (pipelinesOnCommitBranch.length === 0) {
+        return currentRepoPipelines;
+    }
+
+    // process the pipelinesWithSubscribedRepos only when the pipelinesOnCommitBranch is not empty
+    // pipelinesOnCommitBranch has the information to determine the triggering event of downstream subscribing repo
+    pipelinesWithSubscribedRepos.forEach(p => {
+        if (!Array.isArray(p.subscribedScmUrlsWithActions)) {
+            return;
+        }
+        p.subscribedScmUrlsWithActions.forEach(subscribedScmUriWithAction => {
+            const { scmUri: subscribedScmUri, actions: subscribedActions } = subscribedScmUriWithAction;
+
+            if (pipelinesOnCommitBranch[0].scmUri === subscribedScmUri) {
+                const pipeline = pipelinesOnCommitBranch[0];
+                const isReleaseOrTagFiltering = isReleaseOrTagFilteringEnabled(action, pipeline.workflowGraph);
+                const startFrom = determineStartFrom(
+                    action,
+                    type,
+                    branch,
+                    null,
+                    releaseName,
+                    tagName,
+                    isReleaseOrTagFiltering
+                );
+
+                for (const subscribedAction of subscribedActions) {
+                    if (new RegExp(subscribedAction).test(startFrom)) {
+                        currentRepoPipelines.push(p);
+                        break;
+                    }
+                }
+            }
+        });
+    });
+
+    return currentRepoPipelines;
 }
 
 /**
@@ -445,11 +480,12 @@ async function createPREvents(options, request) {
         ref,
         releaseName
     } = options;
+
     const { scm } = request.server.app.pipelineFactory;
     const { eventFactory, pipelineFactory, userFactory } = request.server.app;
     const scmDisplayName = scm.getDisplayName({ scmContext: scmConfig.scmContext });
     const userDisplayName = `${scmDisplayName}:${username}`;
-    let { sha } = options;
+    const { sha } = options;
 
     scmConfig.prNum = prNum;
 
@@ -462,13 +498,11 @@ async function createPREvents(options, request) {
                 let subscribedConfigSha = '';
                 let eventConfig = {};
 
-                // Check if the webhook event is from a subscribed repo and
-                // and fetch the source repo commit sha and save the subscribed sha
                 if (uriTrimmer(scmConfig.scmUri) !== uriTrimmer(p.scmUri)) {
                     subscribedConfigSha = sha;
 
                     try {
-                        sha = await pipelineFactory.scm.getCommitSha({
+                        configPipelineSha = await pipelineFactory.scm.getCommitSha({
                             scmUri: p.scmUri,
                             scmContext: scmConfig.scmContext,
                             token: scmConfig.token
@@ -480,8 +514,6 @@ async function createPREvents(options, request) {
                             logger.info(`skip create event for branch: ${b}`);
                         }
                     }
-
-                    configPipelineSha = sha;
                 } else {
                     try {
                         configPipelineSha = await pipelineFactory.scm.getCommitSha(scmConfig);
@@ -540,7 +572,7 @@ async function createPREvents(options, request) {
                         username,
                         scmContext: scmConfig.scmContext,
                         startFrom: '~subscribe',
-                        sha,
+                        sha: configPipelineSha,
                         configPipelineSha,
                         changedFiles,
                         baseBranch: branch,
@@ -1060,6 +1092,7 @@ async function createEvents(
 async function pushEvent(request, h, parsed, skipMessage, token) {
     const { eventFactory, pipelineFactory, userFactory } = request.server.app;
     const { hookId, checkoutUrl, branch, scmContext, type, action, changedFiles, releaseName, ref } = parsed;
+
     const fullCheckoutUrl = `${checkoutUrl}#${branch}`;
     const scmConfig = {
         scmUri: '',
@@ -1087,6 +1120,7 @@ async function pushEvent(request, h, parsed, skipMessage, token) {
             releaseName,
             ref
         );
+
         let events = [];
 
         if (!pipelines || pipelines.length === 0) {