screwdriver-data-schema 22.12.0 → 23.0.1

package/config/base.js

@@ -63,7 +63,7 @@ const SCHEMA_SUBSCRIBE = Joi.object().keys({
     )
 });
 
-const SCHEMA_CONFIG = Joi.object()
+const SCHEMA_CONFIG_PRE_TEMPLATE_MERGE = Joi.object()
     .keys({
         template: Joi.string().regex(Regex.FULL_TEMPLATE_NAME_WITH_NAMESPACE),
         version: Joi.number().integer().min(1).max(50),
@@ -86,6 +86,21 @@ const SCHEMA_CONFIG = Joi.object()
     })
     .unknown(false);
 
+const SCHEMA_CONFIG_POST_TEMPLATE_MERGE = Joi.object()
+    .keys({
+        version: Joi.number().integer().min(1).max(50),
+        annotations: Annotations.annotations,
+        jobs: SCHEMA_JOBS.required(),
+        shared: SCHEMA_SHARED,
+        cache: SCHEMA_CACHE,
+        childPipelines: SCHEMA_CHILD_PIPELINES,
+        stages: SCHEMA_STAGES,
+        subscribe: SCHEMA_SUBSCRIBE,
+        parameters: Parameters.parameters.default({}),
+        templateVersionId: Joi.number().integer().positive().optional().allow(null)
+    })
+    .unknown(false);
+
 /**
  * Main pieces of a screwdriver.yaml
  * @type {Object}
@@ -97,7 +112,8 @@ module.exports = {
     cache: SCHEMA_CACHE,
     cachePerm: SCHEMA_CACHE_PERMUTATION,
     childPipelines: SCHEMA_CHILD_PIPELINES,
-    config: SCHEMA_CONFIG,
+    configBeforeMergingTemplate: SCHEMA_CONFIG_PRE_TEMPLATE_MERGE,
+    configAfterMergingTemplate: SCHEMA_CONFIG_POST_TEMPLATE_MERGE,
     stageSetupTeardownJob: SCHEMA_SETUP_TEARDOWN_JOB,
     stage: SCHEMA_STAGE,
     stages: SCHEMA_STAGES,

package/migrations/20240228-add_column_templateVersionId_to_pipeline.JS

@@ -0,0 +1,27 @@
+/* eslint-disable new-cap */
+
+'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,
+                'templateVersionId',
+                {
+                    type: Sequelize.INTEGER.UNSIGNED
+                },
+                { transaction }
+            );
+
+            await queryInterface.addIndex(table, {
+                name: `${table}_template_version_id`,
+                fields: ['templateVersionId'],
+                transaction
+            });
+        });
+    }
+};

package/models/build.js

@@ -158,7 +158,6 @@ module.exports = {
                 'meta',
                 'parameters',
                 'steps',
-                'commit',
                 'eventId',
                 'environment',
                 'statusMessage',

package/models/collection.js

@@ -3,17 +3,8 @@
 const Joi = require('joi');
 const mutate = require('../lib/mutate');
 
-const BUILD_MODEL = require('./build').get;
 const PIPELINE_MODEL = require('./pipeline').get;
-const PRS = {
-    open: Joi.number().integer().min(0),
-    failing: Joi.number().integer().min(0)
-};
-const PIPELINE_OBJECT = PIPELINE_MODEL.keys({
-    lastBuilds: Joi.array().items(BUILD_MODEL).optional(),
-    prs: Joi.object(PRS).optional()
-});
-const PIPELINES_MODEL = Joi.array().items(PIPELINE_OBJECT);
+const PIPELINES_MODEL = Joi.array().items(PIPELINE_MODEL);
 const MODEL = {
     id: Joi.number().integer().positive(),
 

package/models/pipeline.js

@@ -112,7 +112,15 @@ const MODEL = {
     })
         .description('A list of badges that pipline has')
         .example(`{ sonar: { name: 'dashboard', uri: 'http://sonar.com/sample1' } }`)
+        .optional(),
+
+    templateVersionId: Joi.number()
+        .integer()
+        .positive()
+        .description("Identifier for this pipeline's template")
+        .example(123345)
         .optional()
+        .allow(null)
 };
 
 const UPDATE_MODEL = { ...CREATE_MODEL, settings: MODEL.settings, badges: MODEL.badges };
@@ -156,7 +164,8 @@ module.exports = {
                 'parameters',
                 'subscribedScmUrlsWithActions',
                 'settings',
-                'badges'
+                'badges',
+                'templateVersionId'
             ]
         )
     ).label('Get Pipeline'),

package/package.json

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