screwdriver-data-schema 22.9.6 → 22.9.8

package/config/regex.js

@@ -41,7 +41,8 @@ module.exports = {
     // Steps can only be named with A-Z,a-z,0-9,-,_
     STEP_NAME: /^[\w-]+$/,
     // Jobs can only be named with A-Z,a-z,0-9,-,_
-    JOB_NAME: /^[\w-]+$/,
+    // Also allow stage setup/teardown like stage@stage-name:setup
+    JOB_NAME: /^(([\w-]+)|(?:stage@([\w-]+):(setup|teardown)))$/,
     // PR JOB Name can only be PR-1 or PR-1:main, group1: PR-prNum, group2: jobName
     PR_JOB_NAME: /^(PR-\d+)(?::([\w-]+))?$/,
     // Match all possible job name

package/models/job.js

@@ -9,7 +9,7 @@ const MODEL = {
     id: Joi.number().integer().positive().description('Identifier of this Job').example(123345),
 
     name: Joi.string()
-        .regex(/^(PR-[0-9]+:)?[\w-]+$/)
+        .regex(/^(PR-[0-9]+:)?(([\w-]+)|(?:stage@([\w-]+):(setup|teardown)))$/)
         .max(110)
         .description('Name of the Job')
         .example('main'),

package/models/pipeline.js

@@ -12,11 +12,19 @@ const mutate = require('../lib/mutate');
 
 const STATES = ['ACTIVE', 'INACTIVE'];
 const BADGE = Joi.object({
-    name: Joi.string().max(128).description('The dashboard name for a badge').example('screwdriver/ui'),
+    defaultName: Joi.string()
+        .max(128)
+        .description('Auto populated dashboard name for a badge')
+        .example('screwdriver/ui'),
+    defaultUri: Joi.string()
+        .max(500)
+        .description('Auto populated url for the badge application dashboard')
+        .example('https://sonar.screwdriver.cd/dashboard?id=112233'),
+    name: Joi.string().max(128).description('The dashboard name for a badge').example('my-screwdriver/ui'),
     uri: Joi.string()
         .max(500)
-        .description('Unique identifier for the badge application dashboard')
-        .example('https://sonar.screwdriver.cd/dashboard?id=112233')
+        .description('The url the badge application dashboard')
+        .example('https://my-sonar.screwdriver.cd/dashboard?id=112233')
 });
 
 const CREATE_MODEL = {

package/package.json

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