screwdriver-api 4.1.172 → 4.1.176

package/package.json

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

package/plugins/builds/index.js

@@ -270,6 +270,7 @@ async function createInternalBuild(config) {
     } else {
         job = await jobFactory.get(jobId);
     }
+
     const internalBuildConfig = {
         jobId: job.id,
         sha: event.sha,
@@ -409,11 +410,6 @@ function parseJobInfo({ joinObj = {}, current, nextJobName, nextPipelineId }) {
  * @return {Promise}                            All finished builds
  */
 async function getFinishedBuilds(event, buildFactory) {
-    if (!event.parentEventId) {
-        // FIXME: remove this flow to always use buildFactory.getLatestBuilds
-        return event.getBuilds();
-    }
-
     // FIXME: buildFactory.getLatestBuilds doesn't return build model
     const builds = await buildFactory.getLatestBuilds({ groupEventId: event.groupEventId });
 

package/plugins/events/README.md

@@ -32,6 +32,9 @@ server.register({
 #### Returns a list of builds associated with the event
 `GET /events/{id}/builds`
 
+`GET /events/{id}/builds?steps=true`
+
+
 #### Get build metrics for a single event
 `GET /events/{id}/metrics`
 

package/plugins/events/listBuilds.js

@@ -24,14 +24,23 @@ module.exports = () => ({
         handler: async (request, h) => {
             const { eventFactory } = request.server.app;
             const event = await eventFactory.get(request.params.id);
+            const { steps } = request.query;
 
             if (!event) {
                 throw boom.notFound('Event does not exist');
             }
 
-            const buildsModel = await event.getBuilds();
+            const buildsModel = await event.getBuilds({
+                readOnly: true
+            });
 
-            const data = await Promise.all(buildsModel.map(async buildModel => buildModel.toJsonWithSteps()));
+            let data;
+
+            if (steps) {
+                data = await Promise.all(buildsModel.map(async buildModel => buildModel.toJsonWithSteps()));
+            } else {
+                data = await Promise.all(buildsModel.map(async buildModel => buildModel.toJson()));
+            }
 
             return h.response(data);
         },
@@ -41,7 +50,16 @@ module.exports = () => ({
         validate: {
             params: joi.object({
                 id: eventIdSchema
-            })
+            }),
+            query: schema.api.pagination.concat(
+                joi.object({
+                    steps: joi
+                        .boolean()
+                        .truthy('true')
+                        .falsy('false')
+                        .default(false)
+                })
+            )
         }
     }
 });

package/plugins/jobs/README.md

@@ -46,6 +46,8 @@ Example payload:
 #### Get list of builds for a single job
 `GET /jobs/{id}/builds`
 
+`GET /jobs/{id}/builds?steps=true`
+
 `GET /jobs/{id}/builds?page=2&count=30&sort=ascending`
 
 `GET /jobs/{id}/builds?page=2&count=30&sort=ascending&sortBy=id`

package/plugins/jobs/listBuilds.js

@@ -23,7 +23,7 @@ module.exports = () => ({
 
         handler: async (request, h) => {
             const factory = request.server.app.jobFactory;
-            const { sort, sortBy, page, count } = request.query;
+            const { sort, sortBy, page, count, steps } = request.query;
 
             return factory
                 .get(request.params.id)
@@ -32,7 +32,7 @@ module.exports = () => ({
                         throw boom.notFound('Job does not exist');
                     }
 
-                    const config = { sort, sortBy: 'createTime' };
+                    const config = { sort, sortBy: 'createTime', readOnly: true };
 
                     if (sortBy) {
                         config.sortBy = sortBy;
@@ -45,7 +45,13 @@ module.exports = () => ({
                     return job.getBuilds(config);
                 })
                 .then(async builds => {
-                    const data = await Promise.all(builds.map(b => b.toJsonWithSteps()));
+                    let data;
+
+                    if (steps) {
+                        data = await Promise.all(builds.map(b => b.toJsonWithSteps()));
+                    } else {
+                        data = await Promise.all(builds.map(b => b.toJson()));
+                    }
 
                     return h.response(data);
                 })
@@ -60,7 +66,15 @@ module.exports = () => ({
             params: joi.object({
                 id: jobIdSchema
             }),
-            query: schema.api.pagination
+            query: schema.api.pagination.concat(
+                joi.object({
+                    steps: joi
+                        .boolean()
+                        .truthy('true')
+                        .falsy('false')
+                        .default(false)
+                })
+            )
         }
     }
 });