@codefresh-io/service-base 3.0.8 → 3.0.11

package/infra/config.js

@@ -62,10 +62,18 @@ base.postgres = {
 
 base.mongo = {
     uri: process.env.MONGO_URI || `mongodb://${APPLICATION_DOMAIN}/${name}`,
-    reconnectTries: process.env.MONGO_RECONNECT_TRIES || Number.MAX_VALUE,
-    reconnectInterval: process.env.MONGO_RECONNECT_INTERVAL || 30 * 1000,
+    options: {
+        reconnectTries: process.env.MONGO_RECONNECT_TRIES || Number.MAX_VALUE,
+        reconnectInterval: process.env.MONGO_RECONNECT_INTERVAL || 30 * 1000,
+    },
 };
 
+if (process.env.MTLS_CERT_PATH) {
+    const credentials = fs.readFileSync(process.env.MTLS_CERT_PATH);
+    base.mongo.options.sslKey = credentials;
+    base.mongo.options.sslCert = credentials;
+}
+
 base.logger = {
     filePath: process.env.LOGS_PATH || path.join(__dirname, '../../logs', 'kubernetes-logs.log'),
     console: true,
@@ -88,8 +96,8 @@ base.logger = {
             }
             // human readable format
             return `${options.timestamp()} ${options.level.toUpperCase()} >> ` +
-            `${options.message || ''}` +
-            `${options.meta && Object.keys(options.meta).length ? ` << ${JSON.stringify(options.meta)}` : ''}`;
+                `${options.message || ''}` +
+                `${options.meta && Object.keys(options.meta).length ? ` << ${JSON.stringify(options.meta)}` : ''}`;
         },
     },
     basePath: null,
@@ -129,6 +137,7 @@ base.safe = { secret: process.env.SAFE_SECRET || 'secret' };
 
 base.redis = {
     url: process.env.REDIS_URL || APPLICATION_DOMAIN,
+    port: process.env.REDIS_PORT || 6379,
     password: process.env.REDIS_PASSWORD || 'redisPassword',
     db: process.env.REDIS_DB || 1,
 };

package/infra/mongo.js

@@ -17,8 +17,7 @@ class Mongo {
     init(config) {
         const clientSettings = {
             promiseLibrary: Promise,
-            reconnectTries: config.mongo.reconnectTries,
-            reconnectInterval: config.mongo.reconnectInterval,
+            ...config.mongo.options,
         };
 
         const logger = require('cf-logs').Logger('codefresh:infra:mongo'); // eslint-disable-line

package/infra/redis.js

@@ -27,6 +27,7 @@ class Redis {
         this.client =
             redis.createClient({
                 host: config.redis.url,
+                port: config.redis.port,
                 password: config.redis.password,
                 db: config.redis.db,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "3.0.8",
+  "version": "3.0.11",
   "main": "index.js",
   "description": "",
   "engines": {
@@ -30,7 +30,7 @@
   "dependencies": {
     "@codefresh-io/authenticated-entity": "^2.13.1",
     "@codefresh-io/cf-openapi": "~0.7.7",
-    "@codefresh-io/eventbus": "^1.3.1",
+    "@codefresh-io/eventbus": "^1.4.1",
     "@codefresh-io/http-infra": "^1.8.9",
     "@codefresh-io/internal-service-config": "^1.0.2",
     "@ronomon/crypto-async": "^5.0.1",
@@ -47,7 +47,7 @@
     "express": "^4.16.4",
     "joi": "^13.0.2",
     "js-yaml": "^3.13.1",
-    "lodash": "4.17.20",
+    "lodash": "4.17.21",
     "method-override": "^3.0.0",
     "mongodb": "~3.3.0",
     "morgan": "^1.9.1",

package/yarn.lock

@@ -321,16 +321,16 @@
     rxjs "^6.4.0"
     websocket "1.0.31"
 
-"@codefresh-io/eventbus@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/eventbus/-/eventbus-1.3.1.tgz#08b3216bcd05876c4e6b51f1376930572b6342cf"
-  integrity sha512-nPyiPlcg3MOgKyvsr5RWqrynSw8TGxOTiX11Ez5zKZYUYYigI5NPVSHeG1zXNEzAHsS32Grevk+Tw3gonQJoVw==
+"@codefresh-io/eventbus@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/eventbus/-/eventbus-1.4.1.tgz#e9803c7df7b421c49118684e0746172318ad382b"
+  integrity sha512-R1DD27pnx2HLuVx8IFENKGCAEb2hH2Gz8YjUqf1LpLIHgbfiwlMl+nKT/Q95iLxO8spYHkc4sfkcqMafKA9quA==
   dependencies:
     amqplib "^0.5.1"
     bluebird "^3.5.0"
-    cf-errors "^0.1.15"
-    debug "^2.6.8"
-    lodash "4.17.20"
+    cf-errors "^0.1.16"
+    debug "2.6.9"
+    lodash "^4.17.21"
     pg "^7.0.2"
     pg-cursor "^1.2.0"
     uuid "^3.0.1"
@@ -1416,6 +1416,13 @@ cf-errors@^0.1.15:
   dependencies:
     lodash "4.17.20"
 
+cf-errors@^0.1.16:
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/cf-errors/-/cf-errors-0.1.16.tgz#03d0b050ac94762552792907b08bd39d1a012116"
+  integrity sha512-ewA6cTS+bVC32NCxIdEu/5HQ8zb09PV1ubdu0t2yPXs51K31gI78+XGEomVjaXdTbZcGBPVIWhFnG6R/U7K4IQ==
+  dependencies:
+    lodash "^4.17.21"
+
 cf-logs@^1.1.24:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/cf-logs/-/cf-logs-1.1.24.tgz#d383162ee937745aef9bf9e64a455e4f1f816ea8"
@@ -4242,16 +4249,16 @@ lodash@4.17.20, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
+lodash@4.17.21, lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 lodash@^4.17.14:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
 lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"