Merge branch 'feature/BB-195-support-passing-notification-destination-creds-by-environement-variable' into q/8.4

Author: bert-e

extensions/notification/NotificationConfigValidator.js

@@ -1,13 +1,26 @@
 const joi = require('joi');
 
+const authSchema = joi.object({
+    type: joi.string(),
+    ssl: joi.boolean(),
+    protocol: joi.string(),
+    ca: joi.string(),
+    client: joi.string(),
+    key: joi.string(),
+    keyPassword: joi.string(),
+    keytab: joi.string(),
+    principal: joi.string(),
+    serviceName: joi.string(),
+});
+
 const destinationSchema = joi.object({
     resource: joi.string().required(),
     type: joi.string().required(),
     host: joi.string().required(),
     port: joi.number().required(),
     internalTopic: joi.string(),
     topic: joi.string().required(),
-    auth: joi.object().default({}),
+    auth: authSchema.default({}),
 });
 
 const joiSchema = joi.object({

extensions/notification/queueProcessor/QueueProcessor.js

@@ -34,8 +34,10 @@ class QueueProcessor extends EventEmitter {
      * @param {String} destinationConfig.host - destination host
      * @param {String} destinationConfig.auth - destination auth configuration
      * @param {String} destinationId - resource name/id of destination
+     * @param {Object} destinationAuth - destination authentication config
      */
-    constructor(mongoConfig, kafkaConfig, notifConfig, destinationId) {
+    constructor(mongoConfig, kafkaConfig, notifConfig, destinationId,
+        destinationAuth) {
         super();
         this.mongoConfig = mongoConfig;
         this.kafkaConfig = kafkaConfig;
@@ -45,6 +47,11 @@ class QueueProcessor extends EventEmitter {
             = notifConfig.destinations.find(dest => dest.resource === destinationId);
         assert(this.destinationConfig, `Invalid destination argument "${destinationId}".` +
         ' Destination could not be found in destinations defined');
+        // overwriting destination auth config
+        // if it was passed by env var
+        if (destinationAuth) {
+            this.destinationConfig.auth = destinationAuth;
+        }
         this.bnConfigManager = null;
         this._consumer = null;
         this._destination = null;

extensions/notification/queueProcessor/task.js

@@ -17,8 +17,26 @@ werelogs.configure({
 try {
     const destination = process.argv[2];
     assert(destination, 'task must be started with a destination as argument');
+    // get destination auth config from environment variables
+    let destinationAuth = {
+        type: process.env.TYPE,
+        ssl: process.env.SSL === 'true',
+        protocol: process.env.PROTOCOL,
+        ca: process.env.CA,
+        client: process.env.CLIENT,
+        key: process.env.KEY,
+        keyPassword: process.env.KEY_PASSWORD,
+        keytab: process.env.KEYTAB,
+        principal: process.env.PRINCIPAL,
+        serviceName: process.env.SERVICE_NAME,
+    };
+    const isDestinationAuthEmpty = Object.values(destinationAuth)
+        .every(x => !x);
+    if (isDestinationAuthEmpty) {
+        destinationAuth = null;
+    }
     const queueProcessor = new QueueProcessor(
-        mongoConfig, kafkaConfig, notifConfig, destination);
+        mongoConfig, kafkaConfig, notifConfig, destination, destinationAuth);
     queueProcessor.start();
 } catch (err) {
     log.error('error starting notification queue processor task', {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backbeat",
-  "version": "8.3.17",
+  "version": "8.4.4",
   "description": "Asynchronous queue and job manager",
   "main": "index.js",
   "scripts": {