screwdriver-api 4.1.270 → 4.1.273

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "4.1.270",
+  "version": "4.1.273",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -105,7 +105,7 @@
     "screwdriver-config-parser": "^7.6.0",
     "screwdriver-coverage-bookend": "^1.0.3",
     "screwdriver-coverage-sonar": "^3.4.0",
-    "screwdriver-data-schema": "^21.26.2",
+    "screwdriver-data-schema": "^21.27.0",
     "screwdriver-datastore-sequelize": "^7.2.7",
     "screwdriver-executor-base": "^8.4.0",
     "screwdriver-executor-docker": "^5.0.1",
@@ -114,7 +114,7 @@
     "screwdriver-executor-queue": "^3.1.2",
     "screwdriver-executor-router": "^2.3.0",
     "screwdriver-logger": "^1.1.0",
-    "screwdriver-models": "^28.17.8",
+    "screwdriver-models": "^28.18.0",
     "screwdriver-notifications-email": "^2.2.0",
     "screwdriver-notifications-slack": "^3.2.1",
     "screwdriver-request": "^1.0.3",

package/plugins/events/create.js

@@ -117,6 +117,8 @@ module.exports = () => ({
 
             if (!pipeline) {
                 throw boom.notFound();
+            } else if (pipeline.state === 'INACTIVE') {
+                throw boom.badRequest('Cannot create an event for an inactive pipeline');
             }
 
             payload.scmContext = pipeline.scmContext;

package/plugins/pipelines/remove.js

@@ -29,10 +29,10 @@ module.exports = () => ({
                     if (!pipeline) {
                         throw boom.notFound('Pipeline does not exist');
                     }
-                    if (pipeline.configPipelineId) {
+                    if (pipeline.configPipelineId && pipeline.state !== 'INACTIVE') {
                         throw boom.forbidden(
                             'Child pipeline can only be removed' +
-                                `by modifying scmUrls in config pipeline ${pipeline.configPipelineId}`
+                                ` after removing it from scmUrls in config pipeline ${pipeline.configPipelineId}`
                         );
                     }
                     if (!user) {

package/plugins/pipelines/startAll.js

@@ -36,7 +36,8 @@ module.exports = () => ({
 
             const pipelines = await pipelineFactory.list({
                 params: {
-                    configPipelineId: id
+                    configPipelineId: id,
+                    state: 'ACTIVE'
                 }
             });
 

package/plugins/webhooks/helper.js

@@ -302,8 +302,18 @@ async function triggeredPipelines(
     const splitUri = scmUri.split(':');
     const scmBranch = `${splitUri[0]}:${splitUri[1]}:${splitUri[2]}`;
     const scmRepoId = `${splitUri[0]}:${splitUri[1]}`;
-    const listConfig = { search: { field: 'scmUri', keyword: `${scmRepoId}:%` } };
-    const externalRepoSearchConfig = { search: { field: 'subscribedScmUrlsWithActions', keyword: `%${scmRepoId}:%` } };
+    const listConfig = {
+        search: { field: 'scmUri', keyword: `${scmRepoId}:%` },
+        params: {
+            state: 'ACTIVE'
+        }
+    };
+    const externalRepoSearchConfig = {
+        search: { field: 'subscribedScmUrlsWithActions', keyword: `%${scmRepoId}:%` },
+        params: {
+            state: 'ACTIVE'
+        }
+    };
 
     const pipelines = await pipelineFactory.list(listConfig);