screwdriver-api 4.1.255 → 4.1.258

package/README.md

@@ -52,14 +52,14 @@ Three (3) options for executor:
  - Nomad (`nomad`)
 
 Three (3) options for SCM:
- - Github (`github`)
- - Gitlab (`gitlab`)
+ - GitHub (`github`)
+ - GitLab (`gitlab`)
  - Bitbucket (`bitbucket`)
 
 ### Prerequisites
 To use Screwdriver, you will need the following prerequisites:
 
-- Node v8.0.0 or higher
+- Node v12.0.0 or higher
 - [Kubernetes][kubectl] or [Docker][docker]
 
 ### From Source

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "4.1.255",
+  "version": "4.1.258",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -79,7 +79,7 @@
     "@hapi/inert": "^6.0.4",
     "@hapi/vision": "^6.1.0",
     "@promster/hapi": "^6.1.0",
-    "async": "^3.2.2",
+    "async": "^3.2.4",
     "badge-maker": "^3.3.1",
     "config": "^1.31.0",
     "date-fns": "^1.30.1",
@@ -87,7 +87,7 @@
     "hapi-auth-bearer-token": "^8.0.0",
     "hapi-auth-jwt2": "^10.2.0",
     "hapi-rate-limit": "^5.0.1",
-    "hapi-swagger": "^14.2.4",
+    "hapi-swagger": "^14.5.4",
     "ioredis": "^4.28.0",
     "joi": "^17.4.2",
     "js-yaml": "^3.14.1",
@@ -114,14 +114,14 @@
     "screwdriver-executor-queue": "^3.1.2",
     "screwdriver-executor-router": "^2.3.0",
     "screwdriver-logger": "^1.1.0",
-    "screwdriver-models": "^28.11.0",
+    "screwdriver-models": "^28.16.1",
     "screwdriver-notifications-email": "^2.2.0",
     "screwdriver-notifications-slack": "^3.2.1",
     "screwdriver-request": "^1.0.3",
     "screwdriver-scm-base": "^7.3.0",
     "screwdriver-scm-bitbucket": "^4.5.1",
-    "screwdriver-scm-github": "^11.6.3",
-    "screwdriver-scm-gitlab": "^2.7.2",
+    "screwdriver-scm-github": "^11.10.0",
+    "screwdriver-scm-gitlab": "^2.10.0",
     "screwdriver-scm-router": "^6.3.0",
     "screwdriver-template-validator": "^5.2.0",
     "screwdriver-workflow-parser": "^3.2.1",
@@ -153,7 +153,7 @@
     "mocha-sonarqube-reporter": "^1.0.2",
     "mockery": "^2.0.0",
     "mz": "^2.6.0",
-    "nock": "^13.2.1",
+    "nock": "^13.2.7",
     "node-plantuml": "^0.5.0",
     "npm-auto-version": "^1.0.0",
     "nyc": "^15.0.0",

package/plugins/builds/index.js

@@ -288,7 +288,21 @@ async function createInternalBuild(config) {
         baseBranch
     };
 
-    if (job.state === 'ENABLED') {
+    let jobState = job.state;
+
+    if (prRef) {
+        // Whether a job is enabled is determined by the state of the original job.
+        // If the original job does not exist, it will be enabled.
+        const originalJobName = job.parsePRJobName('job');
+        const originalJob = await jobFactory.get({
+            name: originalJobName,
+            pipelineId
+        });
+
+        jobState = originalJob ? originalJob.state : 'ENABLED';
+    }
+
+    if (jobState === 'ENABLED') {
         return buildFactory.create(internalBuildConfig);
     }
 

package/plugins/pipelines/index.js

@@ -12,6 +12,7 @@ const listRoute = require('./list');
 const badgeRoute = require('./badge');
 const jobBadgeRoute = require('./jobBadge');
 const listJobsRoute = require('./listJobs');
+const listStagesRoute = require('./listStages');
 const listTriggersRoute = require('./listTriggers');
 const listSecretsRoute = require('./listSecrets');
 const listEventsRoute = require('./listEvents');
@@ -177,6 +178,7 @@ const pipelinesPlugin = {
             badgeRoute({ statusColor }),
             jobBadgeRoute({ statusColor }),
             listJobsRoute(),
+            listStagesRoute(),
             listTriggersRoute(),
             listSecretsRoute(),
             listEventsRoute(),

package/plugins/pipelines/listStages.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const boom = require('@hapi/boom');
+const joi = require('joi');
+const schema = require('screwdriver-data-schema');
+const pipelineIdSchema = schema.models.pipeline.base.extract('id');
+const stageListSchema = joi
+    .array()
+    .items(schema.models.stage.base)
+    .label('List of stages');
+
+module.exports = () => ({
+    method: 'GET',
+    path: '/pipelines/{id}/stages',
+    options: {
+        description: 'Get all stages for a given pipeline',
+        notes: 'Returns all stages for a given pipeline',
+        tags: ['api', 'pipelines', 'stages'],
+        auth: {
+            strategies: ['token'],
+            scope: ['user', 'build', 'pipeline']
+        },
+
+        handler: async (request, h) => {
+            const { pipelineFactory, stageFactory } = request.server.app;
+            const pipelineId = request.params.id;
+
+            return pipelineFactory
+                .get(pipelineId)
+                .then(pipeline => {
+                    if (!pipeline) {
+                        throw boom.notFound('Pipeline does not exist');
+                    }
+
+                    const config = {
+                        params: { pipelineId }
+                    };
+
+                    if (request.query.state) {
+                        config.params.state = request.query.state;
+                    }
+
+                    return stageFactory.list(config);
+                })
+                .then(stages => h.response(stages.map(s => s.toJson())))
+                .catch(err => {
+                    throw err;
+                });
+        },
+        response: {
+            schema: stageListSchema
+        },
+        validate: {
+            params: joi.object({
+                id: pipelineIdSchema
+            })
+        }
+    }
+});

package/plugins/pipelines/listTriggers.js

@@ -20,9 +20,9 @@ module.exports = () => ({
     method: 'GET',
     path: '/pipelines/{id}/triggers',
     options: {
-        description: 'Get all jobs for a given pipeline',
-        notes: 'Returns all jobs for a given pipeline',
-        tags: ['api', 'pipelines', 'jobs'],
+        description: 'Get all triggers for a given pipeline',
+        notes: 'Returns all triggers for a given pipeline',
+        tags: ['api', 'pipelines', 'triggers'],
         auth: {
             strategies: ['token'],
             scope: ['user', 'build', 'pipeline']