screwdriver-data-schema 23.3.3 → 23.5.0

package/config/regex.js

@@ -51,6 +51,8 @@ module.exports = {
     INTERNAL_TRIGGER: /^~([\w-]+)$/,
     // Stages can only be named with A-Z,a-z,0-9,-,_
     STAGE_NAME: /^[\w-]+$/,
+    // Stage name prefixed with @stage. Ex: stage@prod
+    QUALIFIED_STAGE_NAME: /^stage@([\w-]+)$/,
     // Stage trigger like ~stage@deploy or ~stage@stageName:jobName or stage@deploy or stage@stageName:jobName
     STAGE_TRIGGER: /^~?stage@([\w-]+)(?::([\w-]+))?$/,
     // Don't combine EXTERNAL_TRIGGER and EXTERNAL_TRIGGER_AND for backward compatibility

package/models/event.js

@@ -10,6 +10,7 @@ const parentBuildId = require('./build').get.extract('parentBuildId');
 const parentBuilds = require('./build').get.extract('parentBuilds');
 const buildId = require('./build').get.extract('id');
 const prNum = Scm.hook.extract('prNum');
+const { QUALIFIED_STAGE_NAME } = require('../config/regex');
 
 const MODEL = {
     id: Joi.number().integer().positive().description('Identifier of this event').example(123345),
@@ -48,7 +49,7 @@ const MODEL = {
         .description('SHA of the configuration pipeline this project depends on')
         .example('ccc49349d3cffbd12ea9e3d41521480b4aa5de5f'),
     startFrom: Joi.alternatives()
-        .try(trigger, jobName)
+        .try(trigger, jobName, QUALIFIED_STAGE_NAME)
         .description('Event start point - a job name or trigger name (~commit/~pr)')
         .example('~commit'),
     type: Joi.string().valid('pr', 'pipeline').max(10).description('Type of the event').example('pr'),

package/package.json

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

package/plugins/scm.js

@@ -26,6 +26,7 @@ const ADD_WEBHOOK = Joi.object()
     .keys({
         scmUri,
         token,
+        scmRepo,
         actions: Joi.array().items(Joi.string()),
         webhookUrl: Joi.string().uri({
             scheme: ['http', 'https']
@@ -108,6 +109,7 @@ const ADD_PR_COMMENT = Joi.object()
     .keys({
         scmUri,
         token,
+        scmRepo,
         prNum: core.scm.hook.extract('prNum').required(),
         comments: Joi.array()
             .items(
@@ -127,6 +129,7 @@ const UPDATE_COMMIT_STATUS = Joi.object()
     .keys({
         scmUri,
         token,
+        scmRepo,
         sha,
         buildStatus: Joi.string()
             .required()
@@ -156,6 +159,7 @@ const GET_CHANGED_FILES_INPUT = Joi.object()
         type,
         webhookConfig: Joi.object().allow(null).required(),
         token,
+        scmRepo,
         scmContext,
         scmUri: scmUri.optional(),
         prNum
@@ -180,6 +184,7 @@ const DECORATE_COMMIT = Joi.object()
         scmUri,
         sha,
         token,
+        scmRepo,
         scmContext
     })
     .required();
@@ -205,6 +210,7 @@ const GET_BRANCH_LIST = Joi.object()
     .keys({
         scmUri,
         token,
+        scmRepo,
         scmContext
     })
     .required();