screwdriver-queue-service 2.0.28 → 2.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-queue-service",
-  "version": "2.0.28",
+  "version": "2.0.31",
   "description": "Screwdriver Queue Service API",
   "main": "app.js",
   "directories": {

package/plugins/helper.js

@@ -6,6 +6,7 @@ const { queuePrefix } = require('../config/redis');
 
 const RETRY_LIMIT = 3;
 const RETRY_DELAY = 5;
+const calculateDelay = ({ computedValue }) => (computedValue ? RETRY_DELAY * 1000 : 0); // in ms
 
 /**
  * Callback function to retry when HTTP status code is not 2xx
@@ -58,7 +59,7 @@ function formatOptions(method, url, token, json, retryStrategyFn) {
     if (retryStrategyFn) {
         const retry = {
             limit: RETRY_LIMIT,
-            calculateDelay: ({ computedValue }) => (computedValue ? RETRY_DELAY * 1000 : 0) // in ms
+            calculateDelay
         };
 
         if (method === 'POST') {
@@ -255,17 +256,45 @@ async function updateBuild(updateConfig, retryStrategyFn) {
  * @param {Function} retryStrategyFn
  * @return {Promise} response or error
  */
-async function processHooks(apiUri, token, webhookConfig, retryStrategyFn) {
-    return request(formatOptions('POST', `${apiUri}/v4/processHooks`, token, webhookConfig, retryStrategyFn)).then(
-        res => {
+async function processHooks(apiUri, token, webhookConfig) {
+    const options = {
+        method: 'POST',
+        url: `${apiUri}/v4/processHooks`,
+        headers: {
+            Authorization: `Bearer ${token}`
+        },
+        json: webhookConfig,
+        retry: {
+            limit: RETRY_LIMIT,
+            calculateDelay,
+            methods: ['POST']
+        },
+        // Do not retry if the request is received
+        errorCodes: ['EADDRINUSE', 'ECONNREFUSED', 'ENOTFOUND', 'ENETUNREACH', 'EAI_AGAIN']
+    };
+
+    return request(options)
+        .then(res => {
             logger.info(`POST /v4/processHooks completed, ${res.statusCode}, ${JSON.stringify(res.body)}`);
             if ([200, 201, 204].includes(res.statusCode)) {
                 return res;
             }
 
             throw new Error(`Failed to process webhook with ${res.statusCode} code and ${res.body}`);
-        }
-    );
+        })
+        .catch(err => {
+            if (err.code === 'ETIMEDOUT') {
+                logger.info(`POST /v4/processHooks timed out.`);
+                const res = {
+                    statusCode: 504,
+                    message: `POST /v4/processHooks timed out.`
+                };
+
+                return res;
+            }
+
+            throw err;
+        });
 }
 
 module.exports = {

package/plugins/worker/lib/jobs.js

@@ -62,7 +62,7 @@ const blockedByOptions = {
 const AWS_REGION_MAP = {
     north: 'n',
     west: 'w',
-    northeast: 'nw',
+    northeast: 'ne',
     east: 'e',
     south: 's',
     central: 'c',
@@ -341,7 +341,7 @@ async function sendWebhook(configs) {
     const { webhookConfig, token } = parsedConfig;
     const apiUri = ecosystem.api;
 
-    await helper.processHooks(apiUri, token, webhookConfig, helper.requestRetryStrategyPostEvent);
+    await helper.processHooks(apiUri, token, webhookConfig);
 
     return null;
 }