screwdriver-api 8.0.69 → 8.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.69",
+  "version": "8.0.71",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -125,10 +125,10 @@
     "screwdriver-notifications-email": "^5.0.0",
     "screwdriver-notifications-slack": "^7.0.0",
     "screwdriver-request": "^3.0.0",
-    "screwdriver-scm-base": "^10.0.0",
-    "screwdriver-scm-bitbucket": "^7.0.1",
-    "screwdriver-scm-github": "^14.1.0",
-    "screwdriver-scm-gitlab": "^5.0.1",
+    "screwdriver-scm-base": "^10.0.1",
+    "screwdriver-scm-bitbucket": "^7.4.1",
+    "screwdriver-scm-github": "^14.5.1",
+    "screwdriver-scm-gitlab": "^5.5.1",
     "screwdriver-scm-router": "^9.0.0",
     "screwdriver-template-validator": "^10.0.0",
     "screwdriver-workflow-parser": "^6.1.0",

package/plugins/auth/index.js

@@ -230,6 +230,17 @@ const authPlugin = {
                             scmContext: user.scmContext,
                             scope: ['user']
                         };
+
+                        const scmDisplayName = scm.getDisplayName({ scmContext: profile.scmContext });
+                        const userDisplayName = pluginOptions.authCheckById
+                            ? `${scmDisplayName}:${profile.username}:${profile.scmUserId}`
+                            : `${scmDisplayName}:${profile.username}`;
+                        const admins = pluginOptions.authCheckById ? pluginOptions.sdAdmins : pluginOptions.admins;
+
+                        // Check admin
+                        if (admins.length > 0 && admins.includes(userDisplayName)) {
+                            profile.scope.push('admin');
+                        }
                     }
                     if (token.pipelineId) {
                         // if token has pipelineId then the token is for pipeline

package/plugins/events/helper/createEvent.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { PR_JOB_NAME } = require('screwdriver-data-schema/config/regex');
 const { updateBuildAndTriggerDownstreamJobs } = require('../../builds/helper/updateBuild');
 const { Status, BUILD_STATUS_MESSAGES } = require('../../builds/triggers/helpers');
 
@@ -9,19 +10,40 @@ const { Status, BUILD_STATUS_MESSAGES } = require('../../builds/triggers/helpers
 
 /**
  *
- * @param workflowGraph
+ * @param virtualNodeNames
+ * @param prJobs
  * @returns {Array<Number>}
  */
-function getVirtualJobIds(workflowGraph) {
+function getVirtualJobIds(virtualNodeNames, prJobs) {
     const virtualJobIds = [];
 
+    prJobs.forEach(prJob => {
+        const prJobName = prJob.name.match(PR_JOB_NAME);
+        const nodeName = prJobName ? prJobName[2] : prJob.name;
+
+        if (virtualNodeNames.includes(nodeName)) {
+            virtualJobIds.push(prJob.id);
+        }
+    });
+
+    return virtualJobIds;
+}
+
+/**
+ *
+ * @param workflowGraph
+ * @returns {Array}
+ */
+function getVirtualJobNames(workflowGraph) {
+    const virtualJobNames = [];
+
     workflowGraph.nodes.forEach(node => {
         if (node.virtual) {
-            virtualJobIds.push(node.id);
+            virtualJobNames.push(node.name);
         }
     });
 
-    return virtualJobIds;
+    return virtualJobNames;
 }
 
 /**
@@ -37,26 +59,39 @@ function getVirtualJobIds(workflowGraph) {
  * @returns {Promise<Event>} Newly created event
  */
 async function createEvent(config, server) {
-    const { eventFactory } = server.app;
+    const { eventFactory, jobFactory } = server.app;
     const { username, scmContext } = config;
     const event = await eventFactory.create(config);
-    const virtualJobIds = getVirtualJobIds(event.workflowGraph);
 
     if (event.builds) {
-        const virtualJobBuilds = event.builds.filter(b => virtualJobIds.includes(b.jobId));
-
-        for (const build of virtualJobBuilds) {
-            await updateBuildAndTriggerDownstreamJobs(
-                {
-                    status: Status.SUCCESS,
-                    statusMessage: BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage,
-                    statusMessageType: BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType
-                },
-                build,
-                server,
-                username,
-                scmContext
-            );
+        const jobIds = event.builds.map(b => b.jobId);
+
+        const virtualNodeNames = getVirtualJobNames(event.workflowGraph);
+
+        if (virtualNodeNames.length > 0) {
+            const prJobs = await jobFactory.list({
+                params: {
+                    id: jobIds
+                }
+            });
+
+            const virtualJobIds = getVirtualJobIds(virtualNodeNames, prJobs);
+
+            const virtualJobBuilds = event.builds.filter(b => virtualJobIds.includes(b.jobId));
+
+            for (const build of virtualJobBuilds) {
+                await updateBuildAndTriggerDownstreamJobs(
+                    {
+                        status: Status.SUCCESS,
+                        statusMessage: BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage,
+                        statusMessageType: BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType
+                    },
+                    build,
+                    server,
+                    username,
+                    scmContext
+                );
+            }
         }
     }