screwdriver-api 8.0.115 → 8.0.117

package/package.json

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

package/plugins/builds/triggers/helpers.js

@@ -139,6 +139,17 @@ function hasFreezeWindows(job) {
     return freezeWindows ? freezeWindows.length > 0 : false;
 }
 
+/**
+ * Checks if job has blockedBy
+ * @param {Job} job Job object
+ * @returns {Boolean}
+ */
+function hasBlockedBy(job) {
+    const { blockedBy } = job.permutations[0];
+
+    return blockedBy ? blockedBy.length > 0 : false;
+}
+
 /**
  * Get external pipelineId and job name from the `name`
  * @param {String} name Job name
@@ -771,7 +782,7 @@ async function handleNewBuild({
     newBuild.parentBuildId = parentBuilds.map(build => build.id);
 
     // Bypass execution of the build if the job is virtual
-    if (isVirtualJob && !hasFreezeWindows(job)) {
+    if (isVirtualJob && !hasFreezeWindows(job) && !hasBlockedBy(job)) {
         return updateVirtualBuildSuccess({ server, build: newBuild, event, job });
     }
 
@@ -1310,6 +1321,7 @@ module.exports = {
     trimJobName,
     isStartFromMiddleOfCurrentStage,
     hasFreezeWindows,
+    hasBlockedBy,
     getNextJobStageName,
     updateVirtualBuildSuccess,
     BUILD_STATUS_MESSAGES

package/plugins/builds/triggers/orBase.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { createInternalBuild, Status, updateVirtualBuildSuccess, hasFreezeWindows } = require('./helpers');
+const { createInternalBuild, Status, updateVirtualBuildSuccess, hasFreezeWindows, hasBlockedBy } = require('./helpers');
 
 /**
  * @typedef {import('screwdriver-models').BuildFactory} BuildFactory
@@ -49,6 +49,7 @@ class OrBase {
         });
 
         const hasWindows = hasFreezeWindows(nextJob);
+        const hasBlocked = hasBlockedBy(nextJob);
         const causeMessage = nextJob.name === event.startFrom ? event.causeMessage : '';
 
         if (nextBuild !== null) {
@@ -59,7 +60,7 @@ class OrBase {
             nextBuild.parentBuildId = [this.currentBuild.id];
 
             // Bypass execution of the build if the job is virtual
-            if (isNextJobVirtual && !hasWindows) {
+            if (isNextJobVirtual && !hasWindows && !hasBlocked) {
                 return updateVirtualBuildSuccess({ server: this.server, build: nextBuild, event, job: nextJob });
             }
 
@@ -81,12 +82,12 @@ class OrBase {
             baseBranch: event.baseBranch || null,
             parentBuilds,
             parentBuildId: this.currentBuild.id,
-            start: hasWindows || !isNextJobVirtual,
+            start: hasBlocked || hasWindows || !isNextJobVirtual,
             causeMessage
         });
 
         // Bypass execution of the build if the job is virtual
-        if (isNextJobVirtual && !hasWindows) {
+        if (isNextJobVirtual && !hasWindows && !hasBlocked) {
             await updateVirtualBuildSuccess({ server: this.server, build: nextBuild, event, job: nextJob });
         }
 

package/plugins/events/helper/createEvent.js

@@ -21,7 +21,19 @@ function getVirtualJobIds(virtualNodeNames, prJobs) {
         const prJobName = prJob.name.match(PR_JOB_NAME);
         const nodeName = prJobName ? prJobName[2] : prJob.name;
 
+        // if prJob has blockedBy or freezeWindows annotation
+        // then it needs to be queued for scheduling
         if (virtualNodeNames.includes(nodeName)) {
+            const permutations = prJob.permutations || [];
+            const hasBlockedBy = permutations[0] && permutations[0].blockedBy;
+            const hasFreezeWindows = permutations[0] && permutations[0].freezeWindows;
+
+            const needsScheduling = Boolean(hasBlockedBy || hasFreezeWindows);
+
+            if (needsScheduling) {
+                return;
+            }
+
             virtualJobIds.push(prJob.id);
         }
     });

package/plugins/events/stopBuilds.js

@@ -49,21 +49,24 @@ module.exports = () => ({
 
             // Check permissions
             let permissions;
+            const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
+                username,
+                scmContext,
+                scmUserId
+            );
 
             try {
                 permissions = await user.getPermissions(pipeline.scmUri);
             } catch (err) {
-                if (err.statusCode === 403 && pipeline.scmRepo && pipeline.scmRepo.private) {
-                    throw boom.notFound();
+                // Screwdriver admin can stop all events
+                if (!adminDetails.isAdmin) {
+                    if (err.statusCode === 403 && pipeline.scmRepo && pipeline.scmRepo.private) {
+                        throw boom.notFound();
+                    }
+                    throw boom.boomify(err, { statusCode: err.statusCode });
                 }
-                throw boom.boomify(err, { statusCode: err.statusCode });
             }
 
-            const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
-                username,
-                scmContext,
-                scmUserId
-            );
             const isPrOwner = hoek.reach(event, 'commit.author.username') === username;
 
             // PR author should be able to stop their own PR event

package/plugins/helper.js

@@ -48,13 +48,17 @@ async function getUserPermissions({ user, scmUri, level = 'admin', isAdmin = fal
     // Check if user has push access or is a Screwdriver admin
     let permissions;
 
+    if (isAdmin) {
+        return null;
+    }
+
     try {
         permissions = await user.getPermissions(scmUri);
     } catch (err) {
         permissions = null;
     }
 
-    if (!permissions || (!permissions[level] && !isAdmin)) {
+    if (!permissions || !permissions[level]) {
         throw boom.forbidden(`User ${user.getFullDisplayName()} does not have ${level} permission for this repo`);
     }
 

package/plugins/jobs/update.js

@@ -21,7 +21,7 @@ module.exports = () => ({
         handler: async (request, h) => {
             const { jobFactory, pipelineFactory, userFactory } = request.server.app;
             const { id } = request.params;
-            const { username, scmContext } = request.auth.credentials;
+            const { username, scmContext, scmUserId } = request.auth.credentials;
             const { isValidToken } = request.server.plugins.pipelines;
 
             const job = await jobFactory.get(id);
@@ -51,7 +51,13 @@ module.exports = () => ({
             const scmUri = await getScmUri({ pipeline, pipelineFactory });
 
             // Check the user's permission
-            await getUserPermissions({ user, scmUri, level: 'push' });
+            const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
+                username,
+                scmContext,
+                scmUserId
+            );
+
+            await getUserPermissions({ user, scmUri, level: 'push', isAdmin: adminDetails.isAdmin });
 
             Object.keys(request.payload).forEach(key => {
                 job[key] = request.payload[key];

package/plugins/pipelines/remove.js

@@ -32,16 +32,27 @@ module.exports = () => ({
                     if (pipeline.state === 'DELETING') {
                         throw boom.conflict('This pipeline is already being deleted.');
                     }
-                    if (pipeline.configPipelineId && pipeline.state !== 'INACTIVE') {
-                        throw boom.forbidden(
-                            'Child pipeline can only be removed' +
-                                ` after removing it from scmUrls in config pipeline ${pipeline.configPipelineId}`
-                        );
-                    }
                     if (!user) {
                         throw boom.notFound(`User ${username} does not exist`);
                     }
 
+                    const scmDisplayName = bannerFactory.scm.getDisplayName({ scmContext });
+                    // Lookup whether user is admin
+                    const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
+                        username,
+                        scmDisplayName,
+                        scmUserId
+                    );
+
+                    if (pipeline.configPipelineId && pipeline.state !== 'INACTIVE') {
+                        if (!adminDetails.isAdmin) {
+                            throw boom.forbidden(
+                                'Child pipeline can only be removed' +
+                                    ` after removing it from scmUrls in config pipeline ${pipeline.configPipelineId}`
+                            );
+                        }
+                    }
+
                     // ask the user for permissions on this repo
                     return (
                         user
@@ -55,14 +66,6 @@ module.exports = () => ({
                                 }
                             })
                             .catch(error => {
-                                const scmDisplayName = bannerFactory.scm.getDisplayName({ scmContext });
-                                // Lookup whether user is admin
-                                const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
-                                    username,
-                                    scmDisplayName,
-                                    scmUserId
-                                );
-
                                 // Allow cluster admins to remove pipeline
                                 if (adminDetails.isAdmin) {
                                     return Promise.resolve(null);