screwdriver-api 7.0.262 → 8.0.1

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:22
 
 # Screwdriver Version
 ARG VERSION=latest

package/Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:22
 
 # Create our application directory
 RUN mkdir -p /usr/src/app

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.262",
+  "version": "8.0.1",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "url": "git@github.com:screwdriver-cd/screwdriver.git"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "greenkeeper": {
     "ignore": [
@@ -104,33 +104,33 @@
     "node-env-file": "^0.1.8",
     "prom-client": "^12.0.0",
     "redlock": "^4.2.0",
-    "screwdriver-artifact-bookend": "^2.0.0",
-    "screwdriver-build-bookend": "^4.0.0",
-    "screwdriver-cache-bookend": "^3.0.0",
-    "screwdriver-command-validator": "^4.0.0",
-    "screwdriver-config-parser": "^11.0.0",
-    "screwdriver-coverage-bookend": "^2.0.0",
-    "screwdriver-coverage-sonar": "^4.1.1",
-    "screwdriver-data-schema": "^24.2.0",
-    "screwdriver-datastore-sequelize": "^9.0.0",
-    "screwdriver-executor-base": "^10.0.0",
-    "screwdriver-executor-docker": "^7.0.0",
-    "screwdriver-executor-k8s": "^16.0.0",
+    "screwdriver-artifact-bookend": "^3.0.0",
+    "screwdriver-build-bookend": "^5.0.0",
+    "screwdriver-cache-bookend": "^4.0.0",
+    "screwdriver-command-validator": "^5.0.0",
+    "screwdriver-config-parser": "^12.0.0",
+    "screwdriver-coverage-bookend": "^3.0.0",
+    "screwdriver-coverage-sonar": "^5.0.0",
+    "screwdriver-data-schema": "^25.1.0",
+    "screwdriver-datastore-sequelize": "^10.0.0",
+    "screwdriver-executor-base": "^11.0.0",
+    "screwdriver-executor-docker": "^8.0.1",
+    "screwdriver-executor-k8s": "^17.1.0",
     "screwdriver-executor-k8s-vm": "^5.0.0",
-    "screwdriver-executor-queue": "^5.0.0",
-    "screwdriver-executor-router": "^4.0.0",
-    "screwdriver-logger": "^2.0.0",
-    "screwdriver-models": "^31.1.0",
-    "screwdriver-notifications-email": "^4.0.0",
-    "screwdriver-notifications-slack": "^6.0.0",
-    "screwdriver-request": "^2.0.1",
-    "screwdriver-scm-base": "^9.0.0",
-    "screwdriver-scm-bitbucket": "^6.0.0",
-    "screwdriver-scm-github": "^13.0.0",
-    "screwdriver-scm-gitlab": "^4.0.0",
-    "screwdriver-scm-router": "^8.0.0",
-    "screwdriver-template-validator": "^9.0.0",
-    "screwdriver-workflow-parser": "^5.0.0",
+    "screwdriver-executor-queue": "^6.0.0",
+    "screwdriver-executor-router": "^5.0.0",
+    "screwdriver-logger": "^3.0.0",
+    "screwdriver-models": "^32.0.0",
+    "screwdriver-notifications-email": "^5.0.0",
+    "screwdriver-notifications-slack": "^7.0.0",
+    "screwdriver-request": "^3.0.0",
+    "screwdriver-scm-base": "^10.0.0",
+    "screwdriver-scm-bitbucket": "^7.0.1",
+    "screwdriver-scm-github": "^14.1.0",
+    "screwdriver-scm-gitlab": "^5.0.1",
+    "screwdriver-scm-router": "^9.0.0",
+    "screwdriver-template-validator": "^10.0.0",
+    "screwdriver-workflow-parser": "^6.0.0",
     "sqlite3": "^5.1.4",
     "stream": "0.0.3",
     "tinytim": "^0.1.1",
@@ -150,8 +150,8 @@
     "chai-as-promised": "^7.1.1",
     "chai-jwt": "^2.0.0",
     "coveralls": "^3.1.1",
-    "eslint": "^8.28.0",
-    "eslint-config-screwdriver": "^7.0.0",
+    "eslint": "^8.57.0",
+    "eslint-config-screwdriver": "^8.0.0",
     "form-data": "^4.0.0",
     "import-fresh": "^3.3.0",
     "mocha": "^10.1.0",

package/plugins/jobs/buildCluster/remove.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const boom = require('@hapi/boom');
+const joi = require('joi');
+const schema = require('screwdriver-data-schema');
+const logger = require('screwdriver-logger');
+const idSchema = schema.models.job.base.extract('id');
+
+module.exports = () => ({
+    method: 'DELETE',
+    path: '/jobs/{id}/buildCluster',
+    options: {
+        description: 'Delete the buildCluster override of a job',
+        notes: 'Returns null if successful',
+        tags: ['api', 'jobs'],
+        auth: {
+            strategies: ['token'],
+            scope: ['admin', '!guest']
+        },
+
+        handler: async (request, h) => {
+            const { jobFactory, pipelineFactory } = request.server.app;
+            const { username } = request.auth.credentials;
+            const { id } = request.params;
+            const adminAnnotation = 'screwdriver.cd/sdAdminBuildClusterOverride';
+            const job = await jobFactory.get(id);
+
+            if (!job) {
+                throw boom.notFound(`Job ${id} does not exist`);
+            }
+
+            const pipeline = await pipelineFactory.get(job.pipelineId);
+
+            if (!pipeline) {
+                throw boom.notFound('Pipeline does not exist');
+            }
+
+            // remove buildClusterOverride annotation from job
+            const [permutation] = job.permutations;
+            const buildClusterOverride =
+                permutation && permutation.annotations && permutation.annotations[adminAnnotation];
+
+            if (!buildClusterOverride) {
+                logger.info(`[Audit] ${adminAnnotation} does not exists for jobId:${id}.`);
+
+                return h.response().code(204);
+            }
+
+            logger.info(`[Audit] ${adminAnnotation} for jobId:${id} set to ${buildClusterOverride}, deleting.`);
+
+            delete permutation.annotations[adminAnnotation];
+
+            try {
+                const result = await job.updateBuildCluster();
+
+                logger.info(`[Audit] user ${username} deleted ${adminAnnotation} for jobId:${id}.`);
+
+                return h.response(result.toJson()).code(200);
+            } catch (err) {
+                logger.error(`Failed to remove ${adminAnnotation} for job ${id}: ${err.message}`);
+                throw boom.internal(`Failed to remove ${adminAnnotation} for job ${id}`);
+            }
+        },
+        validate: {
+            params: joi.object({
+                id: idSchema
+            })
+        }
+    }
+});

package/plugins/jobs/buildCluster/update.js

@@ -0,0 +1,85 @@
+'use strict';
+
+const boom = require('@hapi/boom');
+const joi = require('joi');
+const schema = require('screwdriver-data-schema');
+const logger = require('screwdriver-logger');
+const idSchema = schema.models.job.base.extract('id');
+
+module.exports = () => ({
+    method: 'PUT',
+    path: '/jobs/{id}/buildCluster',
+    options: {
+        description: 'Update the buildCluster of a job',
+        notes: 'Update the buildCluster of a specific job',
+        tags: ['api', 'jobs'],
+        auth: {
+            strategies: ['token'],
+            scope: ['admin', '!guest']
+        },
+        handler: async (request, h) => {
+            const adminAnnotation = 'screwdriver.cd/sdAdminBuildClusterOverride';
+            const { payload } = request;
+            const { id } = request.params;
+
+            if (!payload[adminAnnotation]) {
+                throw boom.badRequest(`Payload must contain ${adminAnnotation}`);
+            }
+
+            const { jobFactory, buildClusterFactory, pipelineFactory } = request.server.app;
+            const { scmContext, username } = request.auth.credentials;
+
+            const job = await jobFactory.get(id);
+
+            if (!job) {
+                throw boom.notFound(`Job ${id} does not exist`);
+            }
+
+            const pipeline = await pipelineFactory.get(job.pipelineId);
+
+            if (!pipeline) {
+                throw boom.notFound('Pipeline does not exist');
+            }
+
+            // ensure that the buildCluster is a valid cluster
+            const buildClusterName = payload[adminAnnotation];
+            const buildCluster = await buildClusterFactory.get({ name: buildClusterName, scmContext });
+
+            if (!buildCluster || !buildCluster.isActive) {
+                throw boom.badRequest(`Build cluster ${buildClusterName} does not exist or is not active`);
+            }
+
+            // update job with buildClusterOverride annotation
+            const [permutation] = job.permutations;
+
+            permutation.annotations = permutation.annotations || {};
+
+            const annotations = permutation.annotations;
+
+            if (annotations[adminAnnotation]) {
+                logger.info(
+                    `[Audit] ${adminAnnotation} for jobId:${id} already set to ${annotations[adminAnnotation]}, updating.`
+                );
+            }
+            permutation.annotations[adminAnnotation] = buildClusterName;
+
+            try {
+                const result = await job.updateBuildCluster();
+
+                logger.info(
+                    `[Audit] user ${username} updates ${adminAnnotation} for jobId:${id} to ${buildClusterName}.`
+                );
+
+                return h.response(result.toJson()).code(200);
+            } catch (err) {
+                logger.error(`Failed to update ${adminAnnotation} for job ${id}: ${err.message}`);
+                throw boom.internal(`Failed to update ${adminAnnotation} for job ${id}`);
+            }
+        },
+        validate: {
+            params: joi.object({
+                id: idSchema
+            })
+        }
+    }
+});

package/plugins/jobs/index.js

@@ -7,6 +7,8 @@ const lastSuccessfulMeta = require('./lastSuccessfulMeta');
 const latestBuild = require('./latestBuild');
 const metrics = require('./metrics');
 const notify = require('./notify');
+const addBuildCluster = require('./buildCluster/update');
+const removeBuildCluster = require('./buildCluster/remove');
 
 /**
  * Job API Plugin
@@ -23,7 +25,9 @@ const jobsPlugin = {
             lastSuccessfulMeta(),
             metrics(),
             latestBuild(),
-            notify()
+            notify(),
+            addBuildCluster(),
+            removeBuildCluster()
         ]);
     }
 };