@codefresh-io/service-base 3.0.5 → 3.0.9

package/infra/config.js

@@ -54,6 +54,7 @@ base.eventbus = {
 
 base.postgres = {
     host: process.env.POSTGRES_HOST || APPLICATION_DOMAIN,
+    port: process.env.POSTGRES_PORT || 5432,
     database: process.env.POSTGRES_DATABASE || 'postgres',
     user: process.env.POSTGRES_USER || 'postgres',
     password: process.env.POSTGRES_PASSWORD || 'postgres',
@@ -61,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,
@@ -87,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,

package/infra/eventbus.js

@@ -35,6 +35,7 @@ class Eventbus {
                     },
                     store: {
                         host: this.config.postgres.host,
+                        port: this.config.postgres.port,
                         database: this.config.postgres.database,
                         user: this.config.postgres.user,
                         password: this.config.postgres.password,

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "3.0.5",
+  "version": "3.0.9",
   "main": "index.js",
   "description": "",
   "engines": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/codefresh-io/service-base#readme",
   "dependencies": {
-    "@codefresh-io/authenticated-entity": "^2.11.1",
+    "@codefresh-io/authenticated-entity": "^2.13.1",
     "@codefresh-io/cf-openapi": "~0.7.7",
     "@codefresh-io/eventbus": "^1.3.1",
-    "@codefresh-io/http-infra": "^1.8.5",
+    "@codefresh-io/http-infra": "^1.8.9",
     "@codefresh-io/internal-service-config": "^1.0.2",
     "@ronomon/crypto-async": "^5.0.1",
     "@wegolook/joi-objectid": "^2.4.0",

package/yarn.lock

@@ -286,12 +286,12 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@codefresh-io/authenticated-entity@^2.11.1":
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/authenticated-entity/-/authenticated-entity-2.11.1.tgz#896b7435adc3d8fc531d1b6510b5d1d51c00c5cf"
-  integrity sha512-kctZR4v7aVQPkeq0BvJAs/nPps+nwrePGmt3SSRI7enTD87HfSm3DrjfFK2Nq+wV1pQUui1sU2Qe0gR7+Vhj8Q==
+"@codefresh-io/authenticated-entity@^2.13.1":
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/authenticated-entity/-/authenticated-entity-2.13.1.tgz#d5b03a71206bd45754a92499a98a3fdae7a79d8c"
+  integrity sha512-c98gnku0uuUWcQCEikgyN2FGqM6EJhqAXMQqczzt239EGij5GQWutzlBK80uxKVMr0LIDRENFyy0KCUmgCVzoA==
   dependencies:
-    lodash "4.17.20"
+    lodash "^4.17.21"
     semver "^7.0.0"
 
 "@codefresh-io/cf-openapi@~0.7.7":
@@ -335,16 +335,16 @@
     pg-cursor "^1.2.0"
     uuid "^3.0.1"
 
-"@codefresh-io/http-infra@^1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/http-infra/-/http-infra-1.8.5.tgz#2f1954ab7f957633be750f3e0c344591db6ff814"
-  integrity sha512-mF9v6Yd+KPeRe8WM5vPKvMPPwTcc7zpqFP3RroPrrip4Mr1WOPKTTvKC1ngKQAjhJy3DYwZqhQL9ebdUF+mq/w==
+"@codefresh-io/http-infra@^1.8.9":
+  version "1.8.9"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/http-infra/-/http-infra-1.8.9.tgz#08cf741fe18370ebda0b4b4a247b426705bc70df"
+  integrity sha512-cXqC238xR5hNUNkawxcjJM/p4P6Ok5T1O6LZ3qVkCm4kIewSfraw5Jj451eFkXbZyl0EkqoR9a4wsAm2i4zuJQ==
   dependencies:
-    "@codefresh-io/authenticated-entity" "^2.11.1"
+    "@codefresh-io/authenticated-entity" "^2.13.1"
     bluebird "^3.7.2"
     crypto-random-string "^3.3.0"
-    lodash "4.17.20"
-    request "2.88.2"
+    lodash "^4.17.21"
+    request "^2.88.2"
     requestretry "^3.1.0"
 
 "@codefresh-io/internal-service-config@^1.0.2":
@@ -4247,6 +4247,11 @@ lodash@^4.17.14:
   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"