screwdriver-data-schema 21.26.1 → 21.26.4

package/config/settings.js

@@ -2,6 +2,11 @@
 
 const Joi = require('joi');
 
+const SCHEMA_TIMESTAMP_FORMAT = Joi.string()
+    .valid('UTC', 'LOCAL_TIMEZONE', 'HUMAN_READABLE')
+    .optional()
+    .default('HUMAN_READABLE')
+    .description('User preferred timestamp');
 const SCHEMA_DISPLAY_JOB_NAME_LENGTH = Joi.number()
     .integer()
     .min(20)
@@ -46,7 +51,8 @@ const SCHEMA_USER_SETTINGS = Joi.object()
         /\d/,
         Joi.object().keys({
             displayJobNameLength: SCHEMA_DISPLAY_JOB_NAME_LENGTH,
-            showPRJobs: Joi.boolean()
+            showPRJobs: Joi.boolean(),
+            timestampFormat: SCHEMA_TIMESTAMP_FORMAT
         })
     )
     .unknown();

package/config/template.js

@@ -3,7 +3,6 @@
 const Joi = require('joi');
 const Job = require('./job');
 const Regex = require('./regex');
-const Parameters = require('./parameters');
 
 const TEMPLATE_NAMESPACE = Joi.string()
     .regex(Regex.TEMPLATE_NAMESPACE)
@@ -62,8 +61,6 @@ const TEMPLATE_IMAGES = Joi.object()
     })
     .min(1);
 
-const SCHEMA_JOB_PARAMETERS = Parameters.parameters.optional();
-
 const SCHEMA_TEMPLATE = Joi.object().keys({
     namespace: TEMPLATE_NAMESPACE,
     name: TEMPLATE_NAME.required(),
@@ -74,8 +71,7 @@ const SCHEMA_TEMPLATE = Joi.object().keys({
         .required()
         .or('image', 'template')
         .or('steps', 'template'),
-    images: TEMPLATE_IMAGES,
-    parameters: SCHEMA_JOB_PARAMETERS
+    images: TEMPLATE_IMAGES
 });
 
 /**
@@ -93,6 +89,5 @@ module.exports = {
     maintainer: TEMPLATE_MAINTAINER,
     config: Job.templateJob,
     configNoDupSteps: Job.jobNoDupSteps,
-    images: TEMPLATE_IMAGES,
-    parameters: SCHEMA_JOB_PARAMETERS
+    images: TEMPLATE_IMAGES
 };

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

@@ -23,15 +23,6 @@ module.exports = {
                     { 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'],
@@ -41,7 +32,7 @@ module.exports = {
 
                 await queryInterface.addIndex(table, {
                     name: `${table}_group_event_id_create_time`,
-                    fields: ['groupEventId', 'createTime'],
+                    fields: ['groupEventId'],
                     transaction
                 });
                 // eslint-disable-next-line no-empty

package/migrations/20220728171252-remove_column_parameters_from_templates.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}templates`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    up: async (queryInterface, Sequelize) => {
+        try {
+            await queryInterface.removeColumn(table, 'parameters');
+            // eslint-disable-next-line no-empty
+        } catch (e) {}
+    }
+};

package/models/stage.js

@@ -42,11 +42,7 @@ const MODEL = {
         .integer()
         .positive()
         .description('Identifier of the group event')
-        .example(123345),
-
-    createTime: Joi.string()
-        .isoDate()
-        .description('When this stage was created')
+        .example(123345)
 };
 
 module.exports = {
@@ -95,5 +91,5 @@ module.exports = {
      * @property indexes
      * @type {Array}
      */
-    indexes: [{ fields: ['pipelineId'] }, { fields: ['groupEventId', 'createTime'] }]
+    indexes: [{ fields: ['pipelineId'] }, { fields: ['groupEventId'] }]
 };

package/models/template.js

@@ -32,8 +32,7 @@ const MODEL = {
         .description('When this template was created')
         .example('2038-01-19T03:14:08.131Z'),
     trusted: Joi.boolean().description('Mark whether template is trusted'),
-    latest: Joi.boolean().description('Whether this is latest version'),
-    parameters: Template.parameters
+    latest: Joi.boolean().description('Whether this is latest version')
 };
 
 const CREATE_MODEL = { ...MODEL, config: Template.configNoDupSteps };
@@ -65,7 +64,7 @@ module.exports = {
         mutate(
             MODEL,
             ['id', 'labels', 'name', 'version', 'description', 'maintainer', 'pipelineId'],
-            ['config', 'namespace', 'images', 'createTime', 'trusted', 'latest', 'parameters']
+            ['config', 'namespace', 'images', 'createTime', 'trusted', 'latest']
         )
     ).label('Get Template'),
 
@@ -79,7 +78,7 @@ module.exports = {
         mutate(
             CREATE_MODEL,
             ['config', 'name', 'version', 'description', 'maintainer'],
-            ['labels', 'namespace', 'images', 'parameters']
+            ['labels', 'namespace', 'images']
         )
     ).label('Create Template'),
 

package/package.json

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