@everymundo/em-eureka - npm Package Compare versions

Comparing version 1.4.0 to 1.5.0

index.js

 'use strict';
 
-const { Eureka }    = require('eureka-js-client');
-const assert        = require('assert');
-const ip            = require('ip');
-const { Resilient } = require('./load-resilient');
-const { getMicroserviceName } = require('@everymundo/generate-microservice-name');
-const logr                    = require('@everymundo/simple-logr');
+const { Eureka } = require('eureka-js-client');
+const assert     = require('assert');
+const ip         = require('ip');
+const logr       = require('@everymundo/simple-logr');
+const { Resilient }           = require('./load-resilient');
+const { parseEureka }         = require('./lib/parse-eureka');
+const { getMicroserviceName, getPrefixedMajorVersionNumber } = require('@everymundo/generate-microservice-name');
+
 const { awsMetadataToEureka } = require('./lib/aws-metadata-to-eureka');
@@ -13,2 +15,5 @@ const { coalesce }            = require('./lib/coalesce');
 
+const { getMetadataFromDCInfo } = require('./lib/get-metadata-from-dcinfo');
+const { configureStopOnSigInt } = require('./lib/configure-stop-on-sigint');
+
 const createDataCenterInfo = (awsIdentityInfo) => {
@@ -38,5 +43,10 @@ if (awsIdentityInfo) {
 
-const { parseEureka } = require('./lib/parse-eureka');
-const { getMetadataFromDCInfo } = require('./lib/get-metadata-from-dcinfo');
+const apiVersion = getPrefixedMajorVersionNumber();
 
+const getDefaultUrl = (ipAddr, port, path) => {
+  const url = `http://${ipAddr}:${Math.abs(port)}/${apiVersion}/${path}`;
+
+  return url;
+};
+
 const createConfig = ({
@@ -73,4 +83,6 @@ instanceId,
       ipAddr,
-      statusPageUrl: coalesce(statusPageUrl, `http://${ipAddr}:${Math.abs(port)}/info`),
-      healthCheckUrl: coalesce(healthCheckUrl, `http://${ipAddr}:${Math.abs(port)}/healthcheck`),
+      // statusPageUrl: coalesce(statusPageUrl, `http://${ipAddr}:${Math.abs(port)}/info`),
+      statusPageUrl: coalesce(statusPageUrl, getDefaultUrl(ipAddr, port, 'info')),
+      // healthCheckUrl: coalesce(healthCheckUrl, `http://${ipAddr}:${Math.abs(port)}/healthcheck`),
+      healthCheckUrl: coalesce(healthCheckUrl, getDefaultUrl(ipAddr, port, 'healthcheck')),
       port: { $: port, '@enabled': 'true' },
@@ -136,4 +148,2 @@ securePort: { $: coalesce(Math.abs(securePort), 9443), '@enabled': (securePort !== undefined).toString() },
 
-const { configureStopOnSigInt } = require('./lib/configure-stop-on-sigint');
-
 const createClient = ({ config, app, hostName, ipAddr, port, vipAddress, eureka, dataCenterInfo, aws }, start = true) => {
@@ -140,0 +150,0 @@ const xConfig = createConfig({ app, hostName, ipAddr, port, vipAddress, eureka, dataCenterInfo, aws });

package.json

 {
   "name": "@everymundo/em-eureka",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "wrapper around eureka-js-client for everymundo microservice apps",
@@ -29,3 +29,3 @@ "main": "index.js",
     "mocha": "^5.0.4",
-    "sinon": "^4.4.6"
+    "sinon": "^4.4.8"
   },
@@ -35,3 +35,3 @@ "dependencies": {
     "@everymundo/config-service-client": "^1.1.1",
-    "@everymundo/generate-microservice-name": "^1.0.1",
+    "@everymundo/generate-microservice-name": "^1.1.1",
     "@everymundo/simple-logr": "^1.1.1",
@@ -38,0 +38,0 @@ "eureka-js-client": "^4.4.1",

test/index.test.js

@@ -209,2 +209,3 @@ 'require strict';
       const port = 10000;
+      const apiVersion = require('../package').version.split('.').shift();
       const res = createConfig({instanceId: 1, app:'valid', port});
@@ -218,4 +219,5 @@ // console.log({res});
           ipAddr: ip,
-          statusPageUrl: `http://${ip}:${port}/info`,
-          healthCheckUrl: `http://${ip}:${port}/healthcheck`,
+          // apiVersion = require('../package').version.split('.').shift()
+          statusPageUrl: `http://${ip}:${port}/v${apiVersion}/info`,
+          healthCheckUrl: `http://${ip}:${port}/v${apiVersion}/healthcheck`,
           port: {
@@ -260,4 +262,4 @@ $: port,
             ipAddr: ip,
-            statusPageUrl: `http://${ip}:9080/info`,
-            healthCheckUrl: `http://${ip}:9080/healthcheck`,
+            statusPageUrl: `http://${ip}:9080/v${majorV}/info`,
+            healthCheckUrl: `http://${ip}:9080/v${majorV}/healthcheck`,
             port: {
@@ -295,2 +297,3 @@ $: 9080,
         const port   = 10000;
+        const apiVersion = require('../package').version.split('.').shift();
 
@@ -306,4 +309,5 @@ const res = createConfig({ instanceId: undefined, ipAddr, app:'valid', port});
             ipAddr,
-            statusPageUrl: `http://${ipAddr}:${port}/info`,
-            healthCheckUrl: `http://${ipAddr}:${port}/healthcheck`,
+            // apiVersion = require('../package').version.split('.').shift()
+            statusPageUrl: `http://${ipAddr}:${port}/v${apiVersion}/info`,
+            healthCheckUrl: `http://${ipAddr}:${port}/v${apiVersion}/healthcheck`,
             port: {
@@ -343,2 +347,3 @@ $: port,
           app        = 'my-app-V1',
+          apiVersion = require('../package').version.split('.').shift(),
           port       = 10000;
@@ -355,4 +360,5 @@
             ipAddr,
-            statusPageUrl:  `http://${ipAddr}:${port}/info`,
-            healthCheckUrl: `http://${ipAddr}:${port}/healthcheck`,
+            // apiVersion = require('../package').version.split('.').shift(),
+            statusPageUrl:  `http://${ipAddr}:${port}/v${apiVersion}/info`,
+            healthCheckUrl: `http://${ipAddr}:${port}/v${apiVersion}/healthcheck`,
             port: {
@@ -359,0 +365,0 @@ $: port,

No alert changes

Improved metrics

Total package byte prevSize

39444

increased by2.52%

Lines of code

907

increased by1.45%

Dependency changes

• Updated@everymundo/generate-microservice-name@^1.1.1