screwdriver-data-schema 25.1.3 → 25.2.0

package/migrations/20250318145743-add-pipelineId-and-archived-index-to-jobs.js

@@ -0,0 +1,19 @@
+/* eslint-disable new-cap */
+
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}jobs`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    up: async (queryInterface, Sequelize) => {
+        await queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.addIndex(table, {
+                name: `${table}_pipelineId_archived`,
+                fields: ['pipelineId', 'archived'],
+                transaction
+            });
+        });
+    }
+};

package/migrations/20250324174119-add-admin-user-ids-to-pipeline.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}pipelines`;
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        await queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.addColumn(
+                table,
+                'adminUserIds',
+                {
+                    type: Sequelize.TEXT,
+                    defaultValue: '[]',
+                    allowNull: false
+                },
+                { transaction }
+            );
+        });
+    }
+};

package/models/job.js

@@ -140,5 +140,10 @@ module.exports = {
      * @property indexes
      * @type {Array}
      */
-    indexes: [{ fields: ['pipelineId', 'state'] }, { fields: ['state'] }, { fields: ['templateId', 'archived'] }]
+    indexes: [
+        { fields: ['pipelineId', 'state'] },
+        { fields: ['state'] },
+        { fields: ['templateId', 'archived'] },
+        { fields: ['pipelineId', 'archived'] }
+    ]
 };

package/models/pipeline.js

@@ -63,8 +63,17 @@ const MODEL = {
 
     createTime: Joi.string().isoDate().description('When this pipeline was created'),
 
+    // This holds the SCM usernames belonging to the pipeline SCM context who have admin privileges.
+    // This should eventually be completely replaced by adminUserIds. Keeping this for now for backward compatibility.
     admins: Joi.object().description('Admins of this Pipeline').example({ myself: true }),
 
+    // Besides users from the pipeline SCM context, this can hold users outside pipeline SCM context who have admin privileges for this pipeline.
+    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(),
+
     workflowGraph: WorkflowGraph.workflowGraph.description('Graph representation of the workflow'),
 
     annotations: Annotations.annotations.description('Pipeline-level annotations'),
@@ -151,7 +160,7 @@ module.exports = {
     get: Joi.object(
         mutate(
             MODEL,
-            ['id', 'scmUri', 'scmContext', 'createTime', 'admins', 'state'],
+            ['id', 'scmUri', 'scmContext', 'createTime', 'admins', 'adminUserIds', 'state'],
             [
                 'workflowGraph',
                 'scmRepo',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-data-schema",
-  "version": "25.1.3",
+  "version": "25.2.0",
   "description": "Internal Data Schema of Screwdriver",
   "main": "index.js",
   "scripts": {
@@ -50,8 +50,8 @@
     "mysql2": "^1.7.0",
     "npx": "^3.0.0",
     "nyc": "^15.1.0",
-    "pg": "^7.18.2",
-    "sequelize": "^6.37.5",
+    "pg": "^8.14.1",
+    "sequelize": "^6.37.6",
     "sequelize-cli": "^6.6.2",
     "sqlite3": "^5.1.7"
   },