@codefresh-io/service-base 3.0.24 → 3.0.26

package/infra/config.js

@@ -140,9 +140,22 @@ base.redis = {
     port: process.env.REDIS_PORT || 6379,
     password: process.env.REDIS_PASSWORD || 'redisPassword',
     db: process.env.REDIS_DB || 1,
-    tls: process.env.REDIS_TLS === 'true' ? {} : undefined,
 };
 
+if (process.env.REDIS_TLS === 'true') {
+    if (process.env.REDIS_CLIENT_CERT_PATH && process.env.REDIS_CA_PATH && process.env.REDIS_CLIENT_KEY_PATH) {
+        const redisCaCredentials = fs.readFileSync(process.env.REDIS_CA_PATH);
+        const redisCertCredentials = fs.readFileSync(process.env.REDIS_CLIENT_CERT_PATH);
+        const redisKeyCredentials = fs.readFileSync(process.env.REDIS_CLIENT_KEY_PATH);
+        _.set(base, 'redis.tls.ca', redisCaCredentials);
+        _.set(base, 'redis.tls.cert', redisCertCredentials);
+        _.set(base, 'redis.tls.key', redisKeyCredentials);
+        // if not passing rejectUnauthorized -- default value set to true
+        _.set(base, 'redis.tls.rejectUnauthorized', process.env.REDIS_REJECT_UNAUTHORIZED !== 'false');
+    } else {
+        base.redis.tls = {};
+    }
+}
 
 // This timers are associated with termination signals the service should handle
 // 1. The grace period should first of all know that no more requests will be forward to the process

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "3.0.24",
+  "version": "3.0.26",
   "main": "index.js",
   "description": "",
   "bin": {
@@ -30,17 +30,17 @@
   "dependencies": {
     "@codefresh-io/authenticated-entity": "^2.13.1",
     "@codefresh-io/cf-monitor": "^0.0.24",
-    "@codefresh-io/cf-openapi": "^0.7.14",
-    "@codefresh-io/eventbus": "1.4.2",
+    "@codefresh-io/cf-openapi": "^0.7.16",
+    "@codefresh-io/eventbus": "1.4.3",
     "@codefresh-io/http-infra": "^1.8.12",
-    "@codefresh-io/internal-service-config": "^1.0.2",
+    "@codefresh-io/internal-service-config": "^1.0.3",
     "@ronomon/crypto-async": "^5.0.1",
     "@wegolook/joi-objectid": "^2.4.0",
     "ajv": "^6.10.0",
     "bluebird": "^3.5.3",
     "body-parser": "^1.19.2",
     "cf-errors": "^0.1.15",
-    "cf-logs": "^1.1.24",
+    "cf-logs": "^1.1.26",
     "chai": "^4.1.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.4",

package/yarn.lock

@@ -293,16 +293,16 @@
   dependencies:
     newrelic "^8.0.0"
 
-"@codefresh-io/cf-openapi@^0.7.14":
-  version "0.7.14"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/cf-openapi/-/cf-openapi-0.7.14.tgz#fe043bd5e267693f9671987f89475b505ba884a3"
-  integrity sha512-b9bJSrDatoq3FFjao2kBUHo/wNV5hO0jJIV7mITNCFdBTChWFNjGAqvXpzwQ930ZeaSQy6ofribHBuFzGE0FeA==
+"@codefresh-io/cf-openapi@^0.7.16":
+  version "0.7.16"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/cf-openapi/-/cf-openapi-0.7.16.tgz#f34a939246f37d5a43546f8317e6fc508f808571"
+  integrity sha512-dmp/oC99ojDQXOR0EdaehRrrxkXDa4iw8WX+WLQJl4vX60BCGBYCu73VcFXT0fzAhRbc/36mDEsdBn5BDgDRFQ==
   dependencies:
     bluebird "^3.5.4"
     body-parser "^1.19.2"
     cf-errors "^0.1.16"
     cf-logs "^1.1.25"
-    columnify "^1.5.4"
+    columnify "1.6.0"
     flat "^4.1.1"
     json-schema-deref-sync "~0.14.0"
     klaw-sync "^6.0.0"
@@ -311,12 +311,12 @@
     request-promise "~4.2.6"
     retry "^0.12.0"
 
-"@codefresh-io/eventbus@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/eventbus/-/eventbus-1.4.2.tgz#864684e5de5fb423028a5d09987c3e14b57702da"
-  integrity sha512-D3JlZwFv8CaCX9oX4HWkTQXDejEPcrDzA8ier/oe+nx3SKWcWFdRu+t0maWYBlw/IQdAIYLRIVV0fGdQmegyiQ==
+"@codefresh-io/eventbus@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/eventbus/-/eventbus-1.4.3.tgz#280c697bb9fe99936e0e961c3a168dde60375b1d"
+  integrity sha512-TQV+jA8pmYxCf/PIf2SKV+dNwNAlQ6imI/7inAAcAutzxF3Pekptc43Lm/2ylQpDm8xE1uyCgXpLvfQpmXpqtg==
   dependencies:
-    amqplib "^0.5.1"
+    amqplib "^0.8.0"
     bluebird "^3.5.0"
     cf-errors "^0.1.16"
     debug "2.6.9"
@@ -337,7 +337,7 @@
     request "^2.88.2"
     requestretry "^7.0.0"
 
-"@codefresh-io/internal-service-config@^1.0.2":
+"@codefresh-io/internal-service-config@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@codefresh-io/internal-service-config/-/internal-service-config-1.0.3.tgz#5f94caa85788a445af0164416303d18a06fd9148"
   integrity sha512-2yXzix98aCQ2o24ka7qyaQCnrzXy8hMMIhCyAi65CrXnauyPyxllDCJppNVBdd9CoBXeD0t3DJiNlzQ4g89NVA==
@@ -981,17 +981,17 @@ ajv@^6.12.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-amqplib@^0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.3.tgz#7ccfc85d12ee7cd3c6dc861bb07f0648ec3d7193"
-  integrity sha512-ZOdUhMxcF+u62rPI+hMtU1NBXSDFQ3eCJJrenamtdQ7YYwh7RZJHOIM1gonVbZ5PyVdYH4xqBPje9OYqk7fnqw==
+amqplib@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.8.0.tgz#088d10bc61cc5ac5a49ac72033c7ac66c23aeb61"
+  integrity sha512-icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA==
   dependencies:
     bitsyntax "~0.1.0"
-    bluebird "^3.5.2"
+    bluebird "^3.7.2"
     buffer-more-ints "~1.0.0"
     readable-stream "1.x >=1.1.9"
-    safe-buffer "~5.1.2"
-    url-parse "~1.4.3"
+    safe-buffer "~5.2.1"
+    url-parse "~1.5.1"
 
 ansi-colors@4.1.1:
   version "4.1.1"
@@ -1279,7 +1279,7 @@ bl@^4.0.1:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.3:
+bluebird@^3.5.0, bluebird@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
   integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
@@ -1490,7 +1490,7 @@ cf-errors@^0.1.15, cf-errors@^0.1.16:
   dependencies:
     lodash "^4.17.21"
 
-cf-logs@^1.1.24, cf-logs@^1.1.25:
+cf-logs@^1.1.25, cf-logs@^1.1.26:
   version "1.1.26"
   resolved "https://registry.yarnpkg.com/cf-logs/-/cf-logs-1.1.26.tgz#a226255cacff0287678c0ba9674c4a46757ca47c"
   integrity sha512-B98GRPf4gj8L2nsASFLW0KGJhLp5qNzJgkjDDRC/tLWF6gBw6DZimnwDkCqdJdrdLctoWHkOUBb+dvSDGr1e+g==
@@ -1704,7 +1704,7 @@ colorspace@1.1.x:
     color "3.0.x"
     text-hex "1.0.x"
 
-columnify@^1.5.4:
+columnify@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
   integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
@@ -5024,10 +5024,10 @@ qs@6.5.3, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
   integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
-querystringify@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue@^4.2.1:
   version "4.5.1"
@@ -5419,7 +5419,7 @@ safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1, s
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -6215,12 +6215,12 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@~1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+url-parse@~1.5.1:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
-    querystringify "^2.0.0"
+    querystringify "^2.1.1"
     requires-port "^1.0.0"
 
 use@^3.1.0: