screwdriver-queue-service 2.0.38 → 2.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-queue-service",
-  "version": "2.0.38",
+  "version": "2.0.41",
   "description": "Screwdriver Queue Service API",
   "main": "app.js",
   "directories": {
@@ -24,7 +24,6 @@
     "joi": "^17.5.0",
     "js-yaml": "^3.14.1",
     "jsonwebtoken": "^8.5.1",
-    "laabr": "^6.1.3",
     "node-resque": "^5.5.3",
     "npm-auto-version": "^1.0.0",
     "redlock": "^4.2.0",

package/plugins/helper.js

@@ -247,6 +247,29 @@ async function updateBuild(updateConfig, retryStrategyFn) {
     );
 }
 
+/**
+ * Notify user with job status
+ * @param {Number} jobId
+ * @param {String} token
+ * @param {Object} payload
+ * @param {String} apiUri
+ * @param {Object} retryStrategyFn
+ */
+async function notifyJob(notifyConfig, retryStrategyFn) {
+    const { token, apiUri, jobId, payload } = notifyConfig;
+
+    return request(formatOptions('POST', `${apiUri}/v4/jobs/${jobId}/notify`, token, payload, retryStrategyFn)).then(
+        res => {
+            logger.info(`POST /v4/jobs/${jobId}/notify completed with attempts, ${res.statusCode}, ${res.attempts}`);
+            if ([200, 201, 204].includes(res.statusCode)) {
+                return res.body;
+            }
+
+            throw new Error(`Could not notify job ${jobId} with ${res.statusCode}code and ${JSON.stringify(res.body)}`);
+        }
+    );
+}
+
 /**
  * Post the webhooks process
  * @method processHooks
@@ -306,5 +329,6 @@ module.exports = {
     createBuildEvent,
     getPipelineAdmin,
     updateBuild,
+    notifyJob,
     processHooks
 };

package/plugins/queue/scheduler.js

@@ -29,51 +29,70 @@ const BLOCKED_BY_SAME_JOB_WAIT_TIME = 5;
 async function postBuildEvent(executor, eventConfig) {
     const { pipeline, job, apiUri, eventId, causeMessage, buildId } = eventConfig;
     const pipelineId = pipeline.id;
+    const jobId = job.id;
 
     try {
         const token = executor.tokenGen({
             pipelineId,
             service: 'queue',
-            jobId: job.id,
+            jobId,
             scmContext: pipeline.scmContext,
             scope: ['user']
         });
 
         const admin = await helper.getPipelineAdmin(token, apiUri, pipelineId, helper.requestRetryStrategy);
 
-        if (admin) {
-            logger.info(
-                `POST event for pipeline ${pipelineId}:${job.name}:${job.id}:${buildId} using user ${admin.username}`
-            );
+        logger.info(
+            `POST event for pipeline ${pipelineId}:${job.name}:${job.id}:${buildId} using user ${admin.username}`
+        );
 
-            const jwt = executor.userTokenGen(admin.username, {}, admin.scmContext);
+        const jwt = executor.userTokenGen(admin.username, {}, admin.scmContext);
 
-            const buildEvent = {
-                pipelineId,
-                startFrom: job.name,
-                creator: {
-                    name: 'Screwdriver scheduler',
-                    username: 'sd:scheduler'
-                },
-                causeMessage: causeMessage || 'Automatically started by scheduler'
-            };
+        const buildEvent = {
+            pipelineId,
+            startFrom: job.name,
+            creator: {
+                name: 'Screwdriver scheduler',
+                username: 'sd:scheduler'
+            },
+            causeMessage: causeMessage || 'Automatically started by scheduler'
+        };
 
-            if (eventId) {
-                buildEvent.parentEventId = eventId;
-            }
-            if (buildId) {
-                buildEvent.buildId = buildId;
-            }
+        if (eventId) {
+            buildEvent.parentEventId = eventId;
+        }
+        if (buildId) {
+            buildEvent.buildId = buildId;
+        }
 
-            await helper.createBuildEvent(apiUri, jwt, buildEvent, helper.requestRetryStrategyPostEvent);
-        } else {
+        await helper.createBuildEvent(apiUri, jwt, buildEvent, helper.requestRetryStrategyPostEvent);
+    } catch (err) {
+        if (err.statusCode === 404) {
             logger.error(
                 `POST event for pipeline failed as no admin found: ${pipelineId}:${job.name}:${job.id}:${buildId}`
             );
 
-            throw new Error(`Pipeline admin not found, cannot process build ${buildId}`);
+            const pipelineToken = executor.tokenGen({
+                pipelineId,
+                service: 'queue',
+                scmContext: pipeline.scmContext,
+                scope: ['pipeline']
+            });
+
+            const status = 'FAILURE';
+            const message = `Pipeline ${pipelineId} does not have admin, unable to start job ${job.name}.`;
+
+            await helper.notifyJob(
+                {
+                    token: pipelineToken,
+                    apiUri,
+                    jobId,
+                    payload: { status, message }
+                },
+                helper.requestRetryStrategyPostEvent
+            );
         }
-    } catch (err) {
+
         logger.error(`Error in post build event function ${buildId} ${err}`);
         throw err;
     }