screwdriver-api 6.0.34 → 6.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "6.0.34",
+  "version": "6.0.35",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/banners/create.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
-const urlLib = require('url');
 
 module.exports = () => ({
     method: 'POST',

package/plugins/buildClusters/create.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const boom = require('@hapi/boom');
 const urlLib = require('url');
+const boom = require('@hapi/boom');
 const validationSchema = require('screwdriver-data-schema');
 
 module.exports = () => ({

package/plugins/builds/create.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const boom = require('@hapi/boom');
 const urlLib = require('url');
+const boom = require('@hapi/boom');
 const validationSchema = require('screwdriver-data-schema');
 
 module.exports = () => ({

package/plugins/collections/create.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
-const urlLib = require('url');
 
 module.exports = () => ({
     method: 'POST',

package/plugins/commands/create.js

@@ -2,11 +2,11 @@
 
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
 const validator = require('screwdriver-command-validator');
 const hoek = require('@hapi/hoek');
-const urlLib = require('url');
 const req = require('screwdriver-request');
 const VERSION_REGEX = schema.config.regex.VERSION;
 const DEFAULT_BYTES = 1024 * 1024 * 1024; // 1GB

package/plugins/commands/createTag.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const joi = require('joi');
 const schema = require('screwdriver-data-schema');
 const baseSchema = schema.models.commandTag.base;
-const urlLib = require('url');
 const VERSION_REGEX = schema.config.regex.VERSION;
 const exactVersionSchema = schema.models.commandTag.base.extract('version');
 const tagSchema = schema.models.commandTag.base.extract('tag');

package/plugins/events/create.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const boom = require('@hapi/boom');
 const urlLib = require('url');
+const boom = require('@hapi/boom');
 const validationSchema = require('screwdriver-data-schema');
 const ANNOT_RESTRICT_PR = 'screwdriver.cd/restrictPR';
 const { getScmUri } = require('../helper');

package/plugins/events/stopBuilds.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const hoek = require('@hapi/hoek');
 const joi = require('joi');
-const urlLib = require('url');
 const schema = require('screwdriver-data-schema');
 const getSchema = schema.models.event.get;
 const idSchema = schema.models.event.base.extract('id');

package/plugins/pipelines/create.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
-const urlLib = require('url');
 const logger = require('screwdriver-logger');
 const { formatCheckoutUrl, sanitizeRootDir } = require('./helper');
 const { getUserPermissions } = require('../helper');

package/plugins/pipelines/listStages.js

@@ -33,39 +33,23 @@ module.exports = () => ({
                         params: { pipelineId }
                     };
 
-                    // Set groupEventId if provided
-                    if (request.query.groupEventId) {
-                        config.params.groupEventId = request.query.groupEventId;
-                    }
-                    // Get specific stages if eventId is provided
-                    else if (request.query.eventId) {
-                        const events = await eventFactory.list({ params: { id: request.query.eventId } });
-
-                        if (!events || Object.keys(events).length === 0) {
-                            throw boom.notFound(`Event ${request.query.eventId} does not exist`);
+                    // Get latest stages
+                    const latestCommitEvents = await eventFactory.list({
+                        params: {
+                            pipelineId,
+                            parentEventId: null,
+                            type: 'pipeline'
+                        },
+                        paginate: {
+                            count: 1
                         }
+                    });
 
-                        config.params.groupEventId = events[0].groupEventId;
+                    if (!latestCommitEvents || Object.keys(latestCommitEvents).length === 0) {
+                        throw boom.notFound(`Latest event does not exist for pipeline ${pipelineId}`);
                     }
-                    // Get latest stages if eventId not provided
-                    else {
-                        const latestCommitEvents = await eventFactory.list({
-                            params: {
-                                pipelineId,
-                                parentEventId: null,
-                                type: 'pipeline'
-                            },
-                            paginate: {
-                                count: 1
-                            }
-                        });
 
-                        if (!latestCommitEvents || Object.keys(latestCommitEvents).length === 0) {
-                            throw boom.notFound(`Latest event does not exist for pipeline ${pipelineId}`);
-                        }
-
-                        config.params.groupEventId = latestCommitEvents[0].groupEventId;
-                    }
+                    config.params.eventId = latestCommitEvents[0].id;
 
                     return stageFactory.list(config);
                 })
@@ -83,8 +67,6 @@ module.exports = () => ({
             }),
             query: schema.api.pagination.concat(
                 joi.object({
-                    eventId: pipelineIdSchema,
-                    groupEventId: pipelineIdSchema,
                     search: joi.forbidden() // we don't support search for Pipeline list stages
                 })
             )

package/plugins/pipelines/tokens/create.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const joi = require('joi');
 const schema = require('screwdriver-data-schema');
 const logger = require('screwdriver-logger');
-const urlLib = require('url');
 const pipelineIdSchema = schema.models.pipeline.base.extract('id');
 const tokenCreateSchema = schema.models.token.create;
 const { getUserPermissions, getScmUri } = require('../../helper');

package/plugins/secrets/create.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
 const logger = require('screwdriver-logger');
-const urlLib = require('url');
 const { getUserPermissions, getScmUri } = require('../helper');
 
 module.exports = () => ({

package/plugins/templates/create.js

@@ -1,11 +1,11 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
 const validator = require('screwdriver-template-validator');
 const templateSchema = schema.api.templateValidator;
 const hoek = require('@hapi/hoek');
-const urlLib = require('url');
 
 module.exports = () => ({
     method: 'POST',

package/plugins/templates/createTag.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const joi = require('joi');
 const schema = require('screwdriver-data-schema');
 const baseSchema = schema.models.templateTag.base;
-const urlLib = require('url');
 
 /* Currently, only build scope is allowed to tag template due to security reasons.
  * The same pipeline that publishes the template has the permission to tag it.

package/plugins/tokens/create.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const urlLib = require('url');
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
-const urlLib = require('url');
 
 module.exports = () => ({
     method: 'POST',

package/plugins/versions.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const checker = require('license-checker');
 const fs = require('fs');
 const path = require('path');
 const process = require('process');
+const checker = require('license-checker');
 const VError = require('verror');
 const schema = require('screwdriver-data-schema');