screwdriver-data-schema 25.2.0 → 25.3.0

package/config/regex.js

@@ -71,13 +71,14 @@ module.exports = {
 
     // Can be ~pr, ~commit, ~release, ~tag or ~commit:branchName, or ~sd@123:component
     // Note: if you modify this regex, you must modify `sdJoi` definition in the `config/job.js`
-    TRIGGER: /^~?(sd@\d+:[\w-]+|(pr|commit|release|tag|subscribe)(:(.+))?)$/,
+    TRIGGER: /^~?(sd@\d+:[\w-]+|(pr|pr-closed|commit|release|tag|subscribe)(:(.+))?)$/,
     // Triggers which always create event
     CORE_TRIGGER: /^~(pr|commit)(:(.+))?$/,
     // Triggers which does not create empty events
     EXTRA_TRIGGER: /^~(release|tag)(:(.+))?$/,
     // Can be ~pr or ~pr:branchName
     PR_TRIGGER: /^~pr(:.+)?$/,
+    PR_CLOSED_TRIGGER: /^~pr-(closed)(:.+)?$/,
     // Can be ~commit or ~commit:branchName
     COMMIT_TRIGGER: /^~commit(:.+)?$/,
     // Can be ~release or ~release:branchName

package/core/scm.js

@@ -185,7 +185,9 @@ const SCHEMA_HOOK = Joi.object()
 
         modifiedFiles: Joi.array().items(Joi.string().allow('')).optional().label('Modified files of head commit'),
 
-        removedFiles: Joi.array().items(Joi.string().allow('')).optional().label('Removed files of head commit')
+        removedFiles: Joi.array().items(Joi.string().allow('')).optional().label('Removed files of head commit'),
+
+        prMerged: Joi.boolean().optional().label('Whether the pull request is merged').example(true).default(false)
     })
     .label('SCM Hook');
 

package/models/pipeline.js

@@ -71,8 +71,8 @@ const MODEL = {
     adminUserIds: Joi.array()
         .items(Joi.number().integer().positive().description('Identifier of the user').example(12345))
         .description('IDs of the users who have admin privileges for this pipeline')
-        .default([])
-        .required(),
+        .example('[12345, 6789]')
+        .default([]),
 
     workflowGraph: WorkflowGraph.workflowGraph.description('Graph representation of the workflow'),
 
@@ -160,7 +160,7 @@ module.exports = {
     get: Joi.object(
         mutate(
             MODEL,
-            ['id', 'scmUri', 'scmContext', 'createTime', 'admins', 'adminUserIds', 'state'],
+            ['id', 'scmUri', 'scmContext', 'createTime', 'admins', 'state'],
             [
                 'workflowGraph',
                 'scmRepo',
@@ -174,7 +174,8 @@ module.exports = {
                 'subscribedScmUrlsWithActions',
                 'settings',
                 'badges',
-                'templateVersionId'
+                'templateVersionId',
+                'adminUserIds'
             ]
         )
     ).label('Get Pipeline'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-data-schema",
-  "version": "25.2.0",
+  "version": "25.3.0",
   "description": "Internal Data Schema of Screwdriver",
   "main": "index.js",
   "scripts": {