screwdriver-api 8.0.12 → 8.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.12",
+  "version": "8.0.14",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -111,7 +111,7 @@
     "screwdriver-config-parser": "^12.0.0",
     "screwdriver-coverage-bookend": "^3.0.0",
     "screwdriver-coverage-sonar": "^5.0.0",
-    "screwdriver-data-schema": "^25.1.3",
+    "screwdriver-data-schema": "^25.2.0",
     "screwdriver-datastore-sequelize": "^10.0.0",
     "screwdriver-executor-base": "^11.0.0",
     "screwdriver-executor-docker": "^8.0.1",

package/plugins/builds/triggers/and.js

@@ -50,6 +50,42 @@ class AndTrigger extends JoinBase {
         return relatedBuilds;
     }
 
+    /**
+     * Get next build in the latest child evnet
+     * @param {Job} nextJob next job
+     * @returns {Promise<Build|null>}
+     */
+    async fetchNextBuildInChildEvents(nextJob) {
+        const childEvents = await this.eventFactory.list({
+            params: {
+                parentEventId: this.currentEvent.id,
+                pipelineId: this.pipelineId
+            }
+        });
+
+        if (childEvents.length === 0) {
+            return null;
+        }
+
+        const childEventBuilds = await this.buildFactory.list({
+            params: {
+                eventId: childEvents.map(e => e.id),
+                jobId: nextJob.id
+            }
+        });
+
+        if (childEventBuilds.length === 0) {
+            return null;
+        }
+
+        // Get the build of the latest evnet
+        const childEventNextBuild = childEventBuilds.reduce((l, r) => {
+            return l.eventId > r.eventId ? l : r;
+        });
+
+        return childEventNextBuild;
+    }
+
     /**
      * Trigger the next jobs of the current job
      * @param {Job} nextJob
@@ -63,28 +99,31 @@ class AndTrigger extends JoinBase {
         logger.info(`Fetching finished builds for event ${this.currentEvent.id}`);
 
         const relatedBuilds = await this.fetchRelatedBuilds();
-
-        // Find the next build from the related builds for this event
-        let nextBuild = relatedBuilds.find(b => b.jobId === nextJob.id && b.eventId === this.currentEvent.id);
-
-        if (!nextBuild) {
+        const childEventBuild = await this.fetchNextBuildInChildEvents(nextJob);
+        const groupEventsNextBuild = relatedBuilds.find(
+            b => b.jobId === nextJob.id && b.eventId > this.currentEvent.id
+        );
+        let currentEventNextBuild = relatedBuilds.find(
+            b => b.jobId === nextJob.id && b.eventId === this.currentEvent.id
+        );
+
+        // Find the next build of this event
+        if (!currentEventNextBuild) {
             // If the build to join fails and it succeeds on restart, depending on the timing, the latest build will be that of a child event.
             // In that case, `nextBuild` will be null and will not be triggered even though there is a build that should be triggered.
             // Now we need to check for the existence of a build that should be triggered in its own event.
-            nextBuild = await this.buildFactory.get({
+            currentEventNextBuild = await this.buildFactory.get({
                 eventId: this.currentEvent.id,
                 jobId: nextJob.id
             });
 
-            if (nextBuild) {
-                relatedBuilds.push(nextBuild);
+            if (currentEventNextBuild) {
+                relatedBuilds.push(currentEventNextBuild);
             }
         }
 
-        if (!nextBuild) {
-            // If the build to join is in the child event, its event id is greater than current event.
-            nextBuild = relatedBuilds.find(b => b.jobId === nextJob.id && b.eventId > this.currentEvent.id);
-        }
+        const nextBuild = childEventBuild || currentEventNextBuild || groupEventsNextBuild;
+
         const newParentBuilds = mergeParentBuilds(parentBuilds, relatedBuilds, this.currentEvent, undefined);
         let nextEvent = this.currentEvent;
 

package/plugins/pipelines/update.js

@@ -18,15 +18,18 @@ const ANNOTATION_USE_DEPLOY_KEY = 'screwdriver.cd/useDeployKey';
  * @return {Promise}
  */
 function getPermissionsForOldPipeline({ scmContexts, pipeline, user }) {
+    const isPipelineSCMContextObsolete = !scmContexts.includes(pipeline.scmContext);
+    const isUserFromAnotherSCMContext = user.scmContext !== pipeline.scmContext;
+
     // this pipeline's scmContext has been removed, allow current admin to change it
-    if (!scmContexts.includes(pipeline.scmContext)) {
-        const permission = { admin: false };
+    // also allow pipeline admins from other scmContexts to change it
+    if (isPipelineSCMContextObsolete || isUserFromAnotherSCMContext) {
+        const isUserIdInAdminList = pipeline.adminUserIds.includes(user.id);
+        const isSCMUsernameInAdminsObject = !!pipeline.admins[user.username];
 
-        if (pipeline.admins[user.username]) {
-            permission.admin = true;
-        }
+        const isAdmin = isUserIdInAdminList || (isPipelineSCMContextObsolete && isSCMUsernameInAdminsObject);
 
-        return Promise.resolve(permission);
+        return Promise.resolve({ admin: isAdmin });
     }
 
     return user.getPermissions(pipeline.scmUri);
@@ -136,6 +139,10 @@ module.exports = () => ({
                 [username]: true
             };
 
+            if (!oldPipeline.adminUserIds.includes(user.id)) {
+                oldPipeline.adminUserIds.push(user.id);
+            }
+
             if (settings) {
                 oldPipeline.settings = { ...oldPipeline.settings, ...settings };
             }