screwdriver-api 7.0.106 → 7.0.108

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.106",
+  "version": "7.0.108",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -105,7 +105,7 @@
     "screwdriver-config-parser": "^9.0.0",
     "screwdriver-coverage-bookend": "^2.0.0",
     "screwdriver-coverage-sonar": "^4.1.1",
-    "screwdriver-data-schema": "^23.0.0",
+    "screwdriver-data-schema": "^23.2.0",
     "screwdriver-datastore-sequelize": "^8.1.1",
     "screwdriver-executor-base": "^9.0.1",
     "screwdriver-executor-docker": "^6.0.0",
@@ -114,7 +114,7 @@
     "screwdriver-executor-queue": "^4.0.0",
     "screwdriver-executor-router": "^3.0.0",
     "screwdriver-logger": "^2.0.0",
-    "screwdriver-models": "^29.18.0",
+    "screwdriver-models": "^29.18.4",
     "screwdriver-notifications-email": "^3.0.0",
     "screwdriver-notifications-slack": "^5.0.0",
     "screwdriver-request": "^2.0.1",

package/plugins/builds/README.md

@@ -62,15 +62,16 @@ Example payload:
 }
 ```
 
-#### Creates a build
-`POST /builds`
+#### Get build statuses
+`GET /builds/statuses`
 
-Example payload:
-```json
-{
-    "jobId": "d398fb192747c9a0124e9e5b4e6e8e841cf8c71c"
-}
-```
+`GET /builds/statuses?jobIds=1&jobIds=2&numBuilds=3&offset=0`
+
+Arguments:
+
+* `jobIds` - Job IDs for builds to fetch
+* `numBuilds` - Number of builds to load (default 1)
+* `offset` - Number of build statuses to skip (default 0)
 
 #### Updates a build
 `PUT /builds/{id}`

package/plugins/events/listBuilds.js

@@ -28,7 +28,6 @@ module.exports = () => ({
             }
 
             const config = readOnly ? { readOnly: true } : {};
-
             const buildsModel = await event.getBuilds(config);
 
             let data;

package/plugins/pipelines/README.md

@@ -106,10 +106,22 @@ Only PR events of specified PR number will be searched when `prNum` is set
 
 `GET /pipelines/{id}/events?page={pageNumber}&count={countNumber}&sort={sort}&prNum={prNumber}`
 
+#### Get all pipeline builds
+`page`, `count`, `sort`, `latest`, `sortBy`, `fetchSteps`, `readOnly`, and `groupEventId` are optional
+When `latest=true` and `groupEventId` is set, only latest builds in a pipeline based on groupEventId will be returned. The `latest` parameter must be used in conjunction with the `groupEventId`.
+
+`GET /pipelines/{id}/builds?page={pageNumber}&count={countNumber}&sort={sort}&latest=true&groupEventId={groupEventId}&sortBy={sortBy}&fetchSteps=false&readOnly=false`
+
 #### Get all jobs (including pull requests jobs)
 `archived` is optional and has a default value of `false`, which makes the endpoint not return archived jobs (e.g. closed pull requests)
 
-`GET /pipelines/{id}/jobs?archived={boolean}`
+Arguments:
+
+* `archived` - Optional and has a default value of `false`, which makes the endpoint not return archived jobs (e.g. closed pull requests)
+* `type` - Optional and can be set to `pr` or `pipeline` to only return PR jobs or non-PR jobs
+* `jobName` - Optional and can be set to only return only a single job
+
+`GET /pipelines/{id}/jobs?archived={boolean}&type={type}&jobName={jobName}`
 
 #### Get Pipeline Admin
 `GET /pipelines/{id}/admin`
@@ -380,4 +392,4 @@ Example payload:
 {
     "trusted": true
 }
-```
+```

package/plugins/pipelines/index.js

@@ -16,6 +16,7 @@ const listStagesRoute = require('./listStages');
 const listTriggersRoute = require('./listTriggers');
 const listSecretsRoute = require('./listSecrets');
 const listEventsRoute = require('./listEvents');
+const listBuildsRoute = require('./listBuilds');
 const startAllRoute = require('./startAll');
 const createToken = require('./tokens/create');
 const updateToken = require('./tokens/update');
@@ -249,6 +250,7 @@ const pipelinesPlugin = {
             listTriggersRoute(),
             listSecretsRoute(),
             listEventsRoute(),
+            listBuildsRoute(),
             startAllRoute(),
             updateToken(),
             refreshToken(),

package/plugins/pipelines/listBuilds.js

@@ -0,0 +1,92 @@
+'use strict';
+
+const boom = require('@hapi/boom');
+const joi = require('joi');
+const schema = require('screwdriver-data-schema');
+const groupEventIdSchema = schema.models.event.base.extract('groupEventId');
+const pipelineIdSchema = schema.models.pipeline.base.extract('id');
+
+module.exports = () => ({
+    method: 'GET',
+    path: '/pipelines/{id}/builds',
+    options: {
+        description: 'Get builds for this pipeline',
+        notes: 'Returns builds for the given pipeline',
+        tags: ['api', 'pipelines', 'builds'],
+        auth: {
+            strategies: ['token'],
+            scope: ['user', 'build', 'pipeline']
+        },
+
+        handler: async (request, h) => {
+            const factory = request.server.app.pipelineFactory;
+            const { sort, sortBy, page, count, fetchSteps, readOnly, groupEventId, latest } = request.query;
+
+            return factory
+                .get(request.params.id)
+                .then(pipeline => {
+                    if (!pipeline) {
+                        throw boom.notFound('Pipeline does not exist');
+                    }
+
+                    const config = readOnly
+                        ? { sort, sortBy: 'createTime', readOnly: true }
+                        : { sort, sortBy: 'createTime' };
+
+                    if (sortBy) {
+                        config.sortBy = sortBy;
+                    }
+
+                    if (page || count) {
+                        config.paginate = { page, count };
+                    }
+
+                    if (groupEventId) {
+                        config.params = {
+                            ...config.params,
+                            groupEventId
+                        };
+
+                        // Latest flag only works in conjunction with groupEventId
+                        if (latest) {
+                            config.params.latest = latest;
+                        }
+                    }
+
+                    return pipeline.getBuilds(config);
+                })
+                .then(async builds => {
+                    let data;
+
+                    if (fetchSteps) {
+                        data = await Promise.all(builds.map(b => b.toJsonWithSteps()));
+                    } else {
+                        data = await Promise.all(builds.map(b => b.toJson()));
+                    }
+
+                    return h.response(data);
+                })
+                .catch(err => {
+                    throw err;
+                });
+        },
+        response: {
+            schema: joi.array()
+        },
+        validate: {
+            params: joi.object({
+                id: pipelineIdSchema
+            }),
+            query: schema.api.pagination.concat(
+                joi.object({
+                    readOnly: joi.boolean().truthy('true').falsy('false').default(true),
+                    fetchSteps: joi.boolean().truthy('true').falsy('false').default(true),
+                    groupEventId: groupEventIdSchema,
+                    latest: joi.boolean().truthy('true').falsy('false').default(false),
+                    search: joi.forbidden(), // we don't support search for Pipeline list builds
+                    getCount: joi.forbidden() // we don't support getCount for Pipeline list builds
+                })
+            )
+        }
+    }
+});

package/plugins/pipelines/listJobs.js

@@ -6,6 +6,7 @@ const schema = require('screwdriver-data-schema');
 const jobListSchema = joi.array().items(schema.models.job.get).label('List of jobs');
 const jobNameSchema = schema.models.job.base.extract('name');
 const pipelineIdSchema = schema.models.pipeline.base.extract('id');
+const JOB_PR_PATTERN = `PR-%:%`;
 
 module.exports = () => ({
     method: 'GET',
@@ -21,7 +22,7 @@ module.exports = () => ({
 
         handler: async (request, h) => {
             const { pipelineFactory } = request.server.app;
-            const { page, count, jobName } = request.query;
+            const { page, count, jobName, type } = request.query;
 
             return pipelineFactory
                 .get(request.params.id)
@@ -36,6 +37,20 @@ module.exports = () => ({
                         }
                     };
 
+                    if (type) {
+                        config.search = {
+                            field: 'name',
+                            // Do a search for PR-%:% in job name
+                            // See https://www.w3schools.com/sql/sql_like.asp for syntax
+                            keyword: JOB_PR_PATTERN
+                        };
+
+                        if (type === 'pipeline') {
+                            // Do a search for job name without PR-%:% pattern
+                            // See https://www.w3schools.com/sql/sql_not.asp for syntax
+                            config.search.inverse = true;
+                        }
+                    }
                     if (jobName) {
                         config.params.name = jobName;
                     }
@@ -59,6 +74,7 @@ module.exports = () => ({
             }),
             query: schema.api.pagination.concat(
                 joi.object({
+                    type: joi.string().valid('', 'pr', 'pipeline').label('Job type filter (pr or pipeline)').optional(),
                     archived: joi.boolean().truthy('true').falsy('false').default(false),
                     jobName: jobNameSchema,
                     search: joi.forbidden(), // we don't support search for Pipeline list jobs