screwdriver-data-schema 22.7.0 → 22.7.1

package/api/validator.js

@@ -36,7 +36,11 @@ const SCHEMA_JOB_PERMUTATION = Joi.object()
         secrets: Job.secrets,
         settings: Job.settings,
         sourcePaths: Job.sourcePaths,
-        stages: Base.stages,
+        stage: Joi.object()
+            .keys({
+                name: Joi.string().regex(Regex.STAGE_NAME).required()
+            })
+            .unknown(false),
         subscribe: Base.subscribe,
         templateId: Job.templateId
     })

package/migrations/20230907-remove-workflowGraph_column_group_to_stage_and_stageBuild.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const stagesTable = `${prefix}stages`;
+const stageBuildsTable = `${prefix}stageBuilds`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    async up(queryInterface, Sequelize) {
+        await queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.removeColumn(stagesTable, 'workflowGraph', { transaction });
+            await queryInterface.removeColumn(stageBuildsTable, 'workflowGraph', { transaction });
+        });
+    }
+};

package/models/stage.js

@@ -2,7 +2,6 @@
 
 const Joi = require('joi');
 const Regex = require('../config/regex');
-const WorkflowGraph = require('../config/workflowGraph');
 const mutate = require('../lib/mutate');
 
 const MODEL = {
@@ -26,15 +25,7 @@ const MODEL = {
 
     description: Joi.string().max(256).description('Description of the Stage').example('Deploys canary jobs'),
 
-    archived: Joi.boolean().description('Flag if the stage is archived').example(true).default(false),
-
-    workflowGraph: WorkflowGraph.workflowGraph.description('Graph representation of the workflow').example({
-        nodes: [{ name: '~commit' }, { name: 'main' }, { name: 'publish' }],
-        edges: [
-            { src: '~commit', dest: 'main' },
-            { src: 'main', dest: 'publish' }
-        ]
-    })
+    archived: Joi.boolean().description('Flag if the stage is archived').example(true).default(false)
 };
 
 module.exports = {
@@ -61,11 +52,7 @@ module.exports = {
      * @type {Joi}
      */
     get: Joi.object(
-        mutate(
-            MODEL,
-            ['id', 'pipelineId', 'name', 'jobIds'],
-            ['description', 'setup', 'teardown', 'archived', 'workflowGraph']
-        )
+        mutate(MODEL, ['id', 'pipelineId', 'name', 'jobIds'], ['description', 'setup', 'teardown', 'archived'])
     ).label('Get Stage metadata'),
 
     /**
@@ -74,9 +61,9 @@ module.exports = {
      * @property update
      * @type {Joi}
      */
-    update: Joi.object(
-        mutate(MODEL, [], ['jobIds', 'description', 'setup', 'teardown', 'archived', 'workflowGraph'])
-    ).label('Update Stage'),
+    update: Joi.object(mutate(MODEL, [], ['jobIds', 'description', 'setup', 'teardown', 'archived'])).label(
+        'Update Stage'
+    ),
 
     /**
      * List of fields that determine a unique row

package/models/stageBuild.js

@@ -2,7 +2,6 @@
 
 const Joi = require('joi');
 const mutate = require('../lib/mutate');
-const WorkflowGraph = require('../config/workflowGraph');
 const status = require('./build').base.extract('status');
 
 const MODEL = {
@@ -12,14 +11,6 @@ const MODEL = {
 
     eventId: Joi.number().integer().positive().description('Identifier of the event').example(123345),
 
-    workflowGraph: WorkflowGraph.workflowGraph.description('Graph representation of the workflow').example({
-        nodes: [{ name: '~commit' }, { name: 'main' }, { name: 'publish' }],
-        edges: [
-            { src: '~commit', dest: 'main' },
-            { src: 'main', dest: 'publish' }
-        ]
-    }),
-
     status
 };
 
@@ -46,9 +37,7 @@ module.exports = {
      * @property get
      * @type {Joi}
      */
-    get: Joi.object(mutate(MODEL, ['id', 'stageId', 'eventId'], ['workflowGraph', 'status'])).label(
-        'Get Stage Build metadata'
-    ),
+    get: Joi.object(mutate(MODEL, ['id', 'stageId', 'eventId'], ['status'])).label('Get Stage Build metadata'),
 
     /**
      * List of fields that determine a unique row

package/package.json

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