@codefresh-io/kube-integration 2.1.0 → 2.1.2

package/Dockerfile

@@ -16,7 +16,7 @@ RUN yarn install --production --frozen-lockfile
 RUN mkdir /logs
 
 
-FROM octopusdeploy/dhi-node:${DHI_NODE_TAG}_${DHI_NODE_CUSTOMIZATION}@sha256:ad632c0e0c95fe06c45a0deff94899290e0359b547b735469d86203faa1b3d15 AS prod
+FROM octopusdeploy/dhi-node:${DHI_NODE_TAG}_${DHI_NODE_CUSTOMIZATION}@sha256:aceef001165f4e8079d8a1c872b08c91435dbd06ca0cd8c287ed963cda57999b AS prod
 WORKDIR /kube-integration
 COPY --chown=node:node --chmod=755 --from=prod-deps /kube-integration/ /kube-integration/
 COPY --chown=node:node --chmod=755 --from=prod-deps /logs/ /logs/

package/infra/eventbus.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise   = require('bluebird');
 const eventBus  = require('@codefresh-io/eventbus');
 const { Logger } = require('@codefresh-io/cf-telemetry/logs');
 const config    = require('./../config');
@@ -18,48 +17,43 @@ class Eventbus {
      * @returns {*}
      */
     init(config) {
-        return Promise.resolve()
-            .then(() => {
-                this.config = config;
-
-                var deferred = Promise.defer();
-
-                //TODO a fallback for case where rabbitmq is not up. should be removed once rabbitmq is fully used
-                setTimeout(() => {
-                    deferred.resolve();
-                }, 30000);
-
-                eventBus.init({
-                    bus: {
-                        url: this.config.eventbus.uri,
-                        reconnectInterval: 5
-                    },
-                    store: {
-                        host: this.config.postgres.host,
-                        database: this.config.postgres.database,
-                        user: this.config.postgres.user,
-                        password: this.config.postgres.password,
-                        port: this.config.postgres.port,
-                    },
-                    microServiceName: this.config.eventbus.serviceName
-                });
-
-                eventBus.on('ready', () => {
-                    logger.info('Eventbus ready');
-                    this.eventbusInitialized = true;
-                    deferred.resolve();
-                });
-
-                eventBus.on('error', (err) => {
-                    // monitor.noticeError(error); // Used earlier to report an error to New Relic
-                    logger.error(`Eventbus error`, err);
-                });
-
-                return deferred.promise;
-            })
-            .then(() => {
-                return this._start();
-            });
+        this.config = config;
+
+        /** @type {PromiseWithResolvers<void>} */
+        const deferred = Promise.withResolvers();
+
+        //TODO a fallback for case where rabbitmq is not up. should be removed once rabbitmq is fully used
+        setTimeout(() => {
+            deferred.resolve();
+        }, 30000);
+
+        eventBus.init({
+            bus: {
+                url: this.config.eventbus.uri,
+                reconnectInterval: 5
+            },
+            store: {
+                host: this.config.postgres.host,
+                database: this.config.postgres.database,
+                user: this.config.postgres.user,
+                password: this.config.postgres.password,
+                port: this.config.postgres.port,
+            },
+            microServiceName: this.config.eventbus.serviceName
+        });
+
+        eventBus.on('ready', () => {
+            logger.info('Eventbus ready');
+            this.eventbusInitialized = true;
+            deferred.resolve();
+        });
+
+        eventBus.on('error', (err) => {
+            // monitor.noticeError(error); // Used earlier to report an error to New Relic
+            logger.error(`Eventbus error`, err);
+        });
+
+        return deferred.promise.then(() => this._start());
     }
 
 
@@ -71,17 +65,8 @@ class Eventbus {
         if (!this.eventbusInitialized) {
             return Promise.resolve();
         }
-
-        var deferred = Promise.defer();
-
-        eventBus.on('close', () => {
-            logger.info('Eventbus client closed');
-            deferred.resolve();
-        });
-
-        eventBus.quit();
-
-        return deferred.promise;
+        logger.info('Eventbus client closed');
+        return eventBus.quit();
     }
 
     _start() {}
@@ -93,8 +78,7 @@ class Eventbus {
             .catch((err) => {
                 // monitor.noticeError(err); // Used earlier to report an error to New Relic
                 logger.error(`Failed to publish event: ${name}`, err);
-            })
-            .done();
+            });
     }
 
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.0",
+  "version": "2.1.2",
   "name": "@codefresh-io/kube-integration",
   "main": "index.js",
   "description": "",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@codefresh-io/cf-telemetry": "^4.2.1",
     "@codefresh-io/docker-reference": "^0.1.0",
-    "@codefresh-io/eventbus": "^2.4.0",
+    "@codefresh-io/eventbus": "^4.0.1",
     "@codefresh-io/http-infra": "^1.8.15",
     "bluebird": "^3.7.2",
     "cf-errors": "^0.1.17",

package/service.yaml

@@ -1 +1 @@
-version: 2.1.0
+version: 2.1.2