screwdriver-data-schema 21.25.0 → 21.26.1

package/config/base.js

@@ -47,8 +47,7 @@ const SCHEMA_STAGE = Joi.object()
         description: Joi.string(),
         jobs: Joi.array()
             .items(Job.jobName)
-            .min(0),
-        color: Joi.string().regex(Regex.STAGE_COLOR)
+            .min(0)
     })
     .unknown(false);
 

package/config/regex.js

@@ -49,8 +49,6 @@ module.exports = {
     INTERNAL_TRIGGER: /^~([\w-]+)$/,
     // Stages can only be named with A-Z,a-z,0-9,-,_
     STAGE_NAME: /^[\w-]+$/,
-    // Stages can only be named with valid hex CSS color
-    STAGE_COLOR: /^#(?:[0-9a-fA-F]{3}){1,2}$/,
 
     // Don't combine EXTERNAL_TRIGGER and EXTERNAL_TRIGGER_AND for backward compatibility
     // BlockBy does not support EXTERNAL_TRIGGER_AND

package/config/settings.js

@@ -31,7 +31,12 @@ const SCHEMA_PIPELINE_SETTINGS = Joi.object()
         public: Joi.boolean(),
         groupedEvents: Joi.boolean().optional(),
         showEventTriggers: Joi.boolean().optional(),
-        filterEventsForNoBuilds: Joi.boolean().optional()
+        filterEventsForNoBuilds: Joi.boolean().optional(),
+        aliasName: Joi.string()
+            .max(32)
+            .description('A customizable alias for pipeline name')
+            .example('scwdvr-cd')
+            .optional()
     })
     .default({});
 

package/migrations/20220607-initdb-stages.js

@@ -47,7 +47,7 @@ module.exports = {
             });
 
             await queryInterface.addIndex(table, {
-                name: `${prefix}_pipeline_id`,
+                name: `${table}_pipeline_id`,
                 fields: ['pipelineId'],
                 transaction
             });

package/migrations/20220628-remove_pr_jobs_invalid_name.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}jobs`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    async up(queryInterface, Sequelize) {
+        await queryInterface.sequelize.transaction(async transaction => {
+            const dialect = queryInterface.sequelize.getDialect();
+            // sqlite
+            let query = `DELETE FROM "${table}" WHERE "name" LIKE 'PR-%' AND INSTR(name, ':') = 0`;
+
+            if (dialect === 'postgres') {
+                query = `DELETE FROM "${table}" WHERE "name" LIKE 'PR-%' AND POSITION(':' IN "name") = 0`;
+            } else if (dialect === 'mysql') {
+                query = `DELETE FROM \`${table}\` WHERE name LIKE 'PR-%' AND POSITION(':' IN name) = 0`;
+            }
+
+            await queryInterface.sequelize.query(query, { transaction });
+        });
+    }
+};

package/migrations/20220705-upd-stage-color-eventId-createTime.js

@@ -0,0 +1,51 @@
+/* eslint-disable new-cap */
+
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}stages`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    up: async (queryInterface, Sequelize) => {
+        await queryInterface.sequelize.transaction(async transaction => {
+            try {
+                await queryInterface.removeColumn(table, 'color');
+
+                await queryInterface.removeColumn(table, 'state');
+
+                await queryInterface.addColumn(
+                    table,
+                    'groupEventId',
+                    {
+                        type: Sequelize.DOUBLE
+                    },
+                    { transaction }
+                );
+
+                await queryInterface.addColumn(
+                    table,
+                    'createTime',
+                    {
+                        type: Sequelize.STRING(32)
+                    },
+                    { transaction }
+                );
+
+                await queryInterface.addConstraint(table, {
+                    name: `${table}_pipeline_id_name_group_event_id_key`,
+                    fields: ['pipelineId', 'name', 'groupEventId'],
+                    type: 'unique',
+                    transaction
+                });
+
+                await queryInterface.addIndex(table, {
+                    name: `${table}_group_event_id_create_time`,
+                    fields: ['groupEventId', 'createTime'],
+                    transaction
+                });
+                // eslint-disable-next-line no-empty
+            } catch (e) {}
+        });
+    }
+};

package/models/stage.js

@@ -33,23 +33,20 @@ const MODEL = {
         )
         .description('Job IDs in this Stage'),
 
-    state: Joi.string()
-        .valid('ARCHIVED', 'ACTIVE')
-        .max(10)
-        .description('Current state of the Stage')
-        .example('ARCHIVED')
-        .default('ACTIVE'),
-
     description: Joi.string()
         .max(256)
         .description('Description of the Stage')
         .example('Deploys canary jobs'),
 
-    color: Joi.string()
-        .regex(Regex.STAGE_COLOR)
-        .max(7)
-        .description('Color for the Stage')
-        .example('#FFFF00')
+    groupEventId: Joi.number()
+        .integer()
+        .positive()
+        .description('Identifier of the group event')
+        .example(123345),
+
+    createTime: Joi.string()
+        .isoDate()
+        .description('When this stage was created')
 };
 
 module.exports = {
@@ -75,7 +72,7 @@ module.exports = {
      * @property keys
      * @type {Array}
      */
-    keys: ['pipelineId', 'name'],
+    keys: ['pipelineId', 'name', 'groupEventId'],
 
     /**
      * List of all fields in the model
@@ -98,5 +95,5 @@ module.exports = {
      * @property indexes
      * @type {Array}
      */
-    indexes: [{ fields: ['pipelineId'] }]
+    indexes: [{ fields: ['pipelineId'] }, { fields: ['groupEventId', 'createTime'] }]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-data-schema",
-  "version": "21.25.0",
+  "version": "21.26.1",
   "description": "Internal Data Schema of Screwdriver",
   "main": "index.js",
   "scripts": {
@@ -50,12 +50,12 @@
     "npx": "^10.2.2",
     "nyc": "^15.0.0",
     "pg": "^7.18.2",
-    "sequelize": "^6.21.0",
+    "sequelize": "^6.21.3",
     "sequelize-cli": "^6.4.1",
     "sqlite3": "^4.2.0"
   },
   "dependencies": {
-    "cron-parser": "^4.4.0",
+    "cron-parser": "^4.5.0",
     "joi": "^17.6.0"
   }
 }