screwdriver-api 7.0.229 → 7.0.231

package/package.json

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

package/plugins/builds/triggers/helpers.js

@@ -294,6 +294,7 @@ async function createExternalEvent(config) {
  * @param {Boolean} config.start Whether to start the build or not
  * @param {Number|undefined} config.jobId Job ID
  * @param {EventModel} config.event Event build belongs to
+ * @param {String} config.causeMessage Reason the event is run
  * @returns {Promise<BuildModel|null>}
  */
 async function createInternalBuild(config) {
@@ -309,7 +310,8 @@ async function createInternalBuild(config) {
         start,
         baseBranch,
         parentBuildId,
-        jobId
+        jobId,
+        causeMessage
     } = config;
     const { ref = '', prSource = '', prBranchName = '', url = '' } = event.pr || {};
     const prInfo = prBranchName ? { url, prBranchName } : '';
@@ -334,7 +336,8 @@ async function createInternalBuild(config) {
         prSource,
         prInfo,
         start: start !== false,
-        baseBranch
+        baseBranch,
+        causeMessage
     };
 
     let jobState = job.state;
@@ -609,9 +612,10 @@ async function getParentBuildStatus({ newBuild, joinListNames, pipelineId, build
  * @param {String|undefined} arg.pipelineId Pipeline ID
  * @param {String|undefined} arg.stageName Stage name
  * @param {Boolean} arg.isVirtualJob If the job is virtual or not
+ * @param {Event} arg.event Event
  * @returns {Promise<Build|null>} The newly updated/created build
  */
-async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, isVirtualJob }) {
+async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, isVirtualJob, event }) {
     if (!done || Status.isStarted(newBuild.status)) {
         return null;
     }
@@ -647,7 +651,9 @@ async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, sta
     newBuild.status = Status.QUEUED;
     await newBuild.update();
 
-    return newBuild.start();
+    const causeMessage = job.name === event.startFrom ? event.causeMessage : '';
+
+    return newBuild.start({ causeMessage });
 }
 
 /**

package/plugins/builds/triggers/joinBase.js

@@ -105,7 +105,8 @@ class JoinBase {
             job: nextJob,
             pipelineId,
             isVirtualJob: isNextJobVirtual,
-            stageName: nextJobStageName
+            stageName: nextJobStageName,
+            event
         });
     }
 }

package/plugins/builds/triggers/orBase.js

@@ -50,6 +50,8 @@ class OrBase {
         const hasFreezeWindows =
             nextJob.permutations[0].freezeWindows && nextJob.permutations[0].freezeWindows.length > 0;
 
+        const causeMessage = nextJob.name === event.startFrom ? event.causeMessage : '';
+
         if (nextBuild !== null) {
             if (Status.isStarted(nextBuild.status)) {
                 return nextBuild;
@@ -67,7 +69,7 @@ class OrBase {
             nextBuild.status = Status.QUEUED;
             await nextBuild.update();
 
-            return nextBuild.start();
+            return nextBuild.start({ causeMessage });
         }
 
         nextBuild = await createInternalBuild({
@@ -82,7 +84,8 @@ class OrBase {
             baseBranch: event.baseBranch || null,
             parentBuilds,
             parentBuildId: this.currentBuild.id,
-            start: hasFreezeWindows || !isNextJobVirtual
+            start: hasFreezeWindows || !isNextJobVirtual,
+            causeMessage
         });
 
         // Bypass execution of the build if the job is virtual

package/plugins/pipelines/README.md

@@ -110,12 +110,19 @@ Query Params:
 * `sortBy` - *Optional* Field to sort by
 * `type` - *Optional* Get pipeline or pr events (default `pipeline`)
 * `prNum` - *Optional* Return only PR events of specified PR number
-* `sha` - *Optional* Search `sha` and `configPipelineSha` for events
 * `groupEventId` - *Optional* Return only events with a specified groupEventId
 * `id` - *Optional* Fetch specific event ID; alternatively can use greater than(`gt:`) or less than(`lt:`) prefix
+* `sha` - *Optional* Search `sha` and `configPipelineSha` for events
+* `author` - *Optional* Search commit author `username` and `name` for events
+* `creator` - *Optional* Search creator `username` and `name` for events
+* `message` - *Optional* Search commit `message` for events
+
+_Caveats_: Only one of the search fields can be used at one time (sha, author, creator, or message).
 
 `GET /pipelines/{id}/events?page={pageNumber}&count={countNumber}&sort={sort}&type={type}&prNum={prNumber}&sha={sha}`
 
+`GET /pipelines/{id}/events?message={message}`
+
 `GET /pipelines/{id}/events?id=gt:{eventId}&count={countNumber}` (greater than eventId)
 
 `GET /pipelines/{id}/events?id=lt:{eventId}&count={countNumber}&sort=ascending` (less than eventId)

package/plugins/pipelines/listEvents.js

@@ -34,7 +34,7 @@ module.exports = () => ({
 
         handler: async (request, h) => {
             const factory = request.server.app.pipelineFactory;
-            const { page, count, sha, prNum, id, sort, sortBy, groupEventId } = request.query;
+            const { page, count, sha, prNum, id, sort, sortBy, groupEventId, message, author, creator } = request.query;
 
             return factory
                 .get(request.params.id)
@@ -62,13 +62,18 @@ module.exports = () => ({
                         config.params.prNum = prNum;
                     }
 
+                    // Do a search
+                    // See https://www.w3schools.com/sql/sql_like.asp for syntax
                     if (sha) {
-                        config.search = {
-                            field: ['sha', 'configPipelineSha'],
-                            // Do a search for sha
-                            // See https://www.w3schools.com/sql/sql_like.asp for syntax
-                            keyword: `${sha}%`
-                        };
+                        config.search = { field: ['sha', 'configPipelineSha'], keyword: `${sha}%` };
+                    } else if (message) {
+                        config.search = { field: ['commit'], keyword: `%"message":"${message}%` };
+                    } else if (author) {
+                        // searches name and username
+                        config.search = { field: ['commit'], keyword: `%name":"${author}%` };
+                    } else if (creator) {
+                        // searches name and username
+                        config.search = { field: ['creator'], keyword: `%name":"${creator}%` };
                     }
 
                     if (groupEventId) {
@@ -95,15 +100,24 @@ module.exports = () => ({
                 id: pipelineIdSchema
             }),
             query: schema.api.pagination.concat(
-                joi.object({
-                    type: typeSchema,
-                    prNum: prNumSchema,
-                    sha: shaSchema,
-                    id: queryIdSchema,
-                    groupEventId: pipelineIdSchema,
-                    search: joi.forbidden(), // we don't support search for Pipeline list events
-                    getCount: joi.forbidden() // we don't support getCount for Pipeline list events
-                })
+                joi
+                    .object({
+                        type: typeSchema,
+                        prNum: prNumSchema,
+                        sha: shaSchema,
+                        message: joi.string().label('Commit message').example('fix: Typo'),
+                        author: joi.string().label('Author Name').example('Dao Lam'),
+                        creator: joi.string().label('Creator Name').example('Dao Lam'),
+                        id: queryIdSchema,
+                        groupEventId: pipelineIdSchema,
+                        search: joi.forbidden(), // we don't support search for Pipeline list events
+                        getCount: joi.forbidden() // we don't support getCount for Pipeline list events
+                    })
+                    // https://joi.dev/api/?v=17.13.3#objectoxorpeers-options
+                    .oxor('sha', 'message', 'author', 'creator')
+                    .messages({
+                        'object.oxor': 'You can only specify one search parameter: sha, message, author, or creator.'
+                    })
             )
         }
     }