screwdriver-queue-service 2.0.20 → 2.0.21

package/config/custom-environment-variables.yaml

@@ -290,4 +290,6 @@ kafka:
   # Amazon secret access key
   secretAccessKey: KAFKA_ACCESS_KEY_SECRET
   # AWS region 
-  region: AWS_REGION
+  region: AWS_REGION
+  # Flag to use Short Region Name like use2,usw2
+  shortRegion : USE_SHORT_REGION_NAME

package/config/default.yaml

@@ -221,4 +221,6 @@ kafka:
   # Amazon secret access key
   secretAccessKey: KAFKA_ACCESS_KEY_SECRET
   # AWS region 
-  region: AWS_REGION
+  region: AWS_REGION
+  # Flag to use Short Region Name like use2,usw2
+  shortRegion : true

package/config/kafka.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const config = require('config');
+const kafkaConfig = config.get('kafka');
+
+/**
+ * get config
+ * @returns Object containing kafka config values
+ */
+function get() {
+    return {
+        kafkaEnabled: kafkaConfig.enabled === 'true',
+        useShortRegionName: kafkaConfig.shortRegion === 'true'
+    };
+}
+
+module.exports = {
+    get
+};

package/package.json

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

package/plugins/worker/lib/jobs.js

@@ -15,8 +15,8 @@ const blockedByConfig = config.get('plugins').blockedBy;
 const { connectionDetails, queuePrefix, runningJobsPrefix, waitingJobsPrefix } = require('../../../config/redis');
 const rabbitmqConf = require('../../../config/rabbitmq');
 const { amqpURI, exchange, connectOptions } = rabbitmqConf.getConfig();
-const kafkaEnabled = config.get('kafka').enabled === 'true';
-
+const kafkaConfig = require('../../../config/kafka');
+const { kafkaEnabled, useShortRegionName } = kafkaConfig.get();
 const RETRY_LIMIT = 3;
 // This is in milliseconds, reference: https://github.com/actionhero/node-resque/blob/2ffdf0/lib/plugins/Retry.js#L12
 const RETRY_DELAY = 5 * 1000;
@@ -57,6 +57,17 @@ const blockedByOptions = {
 
     collapse: blockedByConfig.collapse
 };
+// AWS region map
+const AWS_REGION_MAP = {
+    north: 'n',
+    west: 'w',
+    northeast: 'nw',
+    east: 'e',
+    south: 's',
+    central: 'c',
+    southeast: 'se'
+};
+
 let rabbitmqConn;
 
 /**
@@ -134,6 +145,23 @@ async function pushToKafka(message, topic) {
     }
 }
 
+/**
+ *
+ * @param {*String} accountId The AWS accountId
+ * @param {*String} region The region name
+ * @returns String topicName
+ */
+function getTopicName(accountId, region) {
+    const items = region.split('-');
+
+    if (items.length < 3 || !useShortRegionName) {
+        return `builds-${accountId}-${region}`;
+    }
+
+    const shortRegion = ''.concat(items[0], AWS_REGION_MAP[items[1]], items[2]);
+
+    return `builds-${accountId}-${shortRegion}`;
+}
 /**
  * Schedule a job based on mode
  * @method schedule
@@ -153,9 +181,8 @@ async function schedule(job, buildConfig) {
 
     if (kafkaEnabled && buildConfig.provider) {
         const { accountId, region } = buildConfig.provider;
-        const topic = `builds-${accountId}-${region}`;
 
-        return pushToKafka(msg, topic);
+        return pushToKafka(msg, getTopicName(accountId, region));
     }
 
     if (rabbitmqConf.getConfig().schedulerMode) {