Merge branch 'improvement/BB-623' into q/8.7

extensions/notification/NotificationConfigValidator.js

@@ -33,7 +33,9 @@ const joiSchema = joi.object({
         concurrency: joi.number().greater(0).default(1000),
     },
     destinations: joi.array().items(destinationSchema).default([]),
-    probeServer: probeServerJoi.default()
+    // TODO: BB-625 reset to being required after supporting probeserver in S3C
+    // for bucket notification proceses
+    probeServer: probeServerJoi.optional()
 });
 
 function configValidator(backbeatConfig, extConfig) {

lib/Config.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert');
 const { EventEmitter } = require('events');
+const joi = require('joi');
 
 const fs = require('fs');
 const path = require('path');
@@ -54,10 +55,16 @@ class Config extends EventEmitter {
             throw new Error(`could not parse config file: ${err.message}`);
         }
 
-        const { value: parsedConfig, err } = backbeatConfigJoi.validate(config);
-        if (err) {
-            throw new Error(`could not validate config file: ${err.message}`);
-        }
+        this._parseConfig(config);
+    }
+
+    /**
+     * Parses Backbeat's configuration
+     * @param {Object} config backbeat configuration
+     * @returns {undefined}
+     */
+    _parseConfig(config) {
+        const parsedConfig = joi.attempt(config, backbeatConfigJoi);
 
         if (parsedConfig.extensions) {
             Object.keys(parsedConfig.extensions).forEach(extName => {

lib/config.joi.js

@@ -55,7 +55,13 @@ const joiSchema = joi.object({
         }).when('logSource', { is: 'dmd', then: joi.required() }),
         mongo: mongoJoi,
         kafka: qpKafkaJoi.when('logSource', { is: 'kafka', then: joi.required() }),
-        probeServer: probeServerJoi.default(),
+        // TODO: BB-625 reset to being required after supporting probeserver in S3C
+        // for bucket notification proceses
+        probeServer: probeServerJoi.when('...extensions', {
+            is: joi.object().keys({ notification: joi.exist() }),
+            then: joi.optional(),
+            otherwise: joi.required(),
+        }),
         circuitBreaker: joi.object().optional(),
     },
     log: logJoi,

lib/util/probe.js

@@ -26,8 +26,7 @@ const RdkafkaStats = require('node-rdkafka-prometheus');
  */
 function startProbeServer(config, callback) {
     if (!config) {
-        const err =  new Error('configuration for probe server is missing');
-        callback(err);
+        callback();
         return;
     }
 

tests/config.json

@@ -249,10 +249,6 @@
         "host": "127.0.0.1",
         "port": 8900
     },
-    "healthcheckServer": {
-        "bindAddress": "0.0.0.0",
-        "port": 4042
-    },
     "redis": {
         "name": "backbeat-test",
         "password": "",

tests/unit/lib/config/Config.spec.js

@@ -0,0 +1,25 @@
+'use strict'; // eslint-disable-line
+
+const assert = require('assert');
+
+const { Config } = require('../../../../lib/Config');
+const backbeatConfig = require('./config.json');
+
+describe('Config', () => {
+    it('should make the probeserver config in the queuePoulator' +
+        'required when multiple extensions are configured', () => {
+        const config = new Config();
+        const testConfig = { ...backbeatConfig };
+        delete testConfig.queuePopulator.probeServer;
+        assert.throws(() => config._parseConfig(testConfig));
+    });
+
+    it('should make the probeserver config in the queuePoulator' +
+        'optional when only notification config is specified', () => {
+        const config = new Config();
+        const testConfig = { ...backbeatConfig };
+        delete testConfig.queuePopulator.probeServer;
+        testConfig.extensions = { notification: testConfig.extensions.notification };
+        assert.doesNotThrow(() => config._parseConfig(testConfig));
+    });
+});