Fix a bunch of unit tests

coveord · Nov 1, 2023 · 79d316b · 79d316b
1 parent 0d7dac4
commit 79d316b
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -161,7 +161,7 @@ const client = new Eureka({
     },
     serviceUrls: {
       'us-east-1c': [
-        'http://ec2-fake-552-627-568-165.compute-1.amazonaws.com:7001/eureka/v2/apps/', 'http://ec2-fake-368-101-182-134.compute-1.amazonaws.com:7001/eureka/v2/apps/'
+        'http://ec2-fake-552-627-568-165.compute-1.amazonaws.com:7001/eureka/apps/', 'http://ec2-fake-368-101-182-134.compute-1.amazonaws.com:7001/eureka/apps/'
       ],
       'us-east-1d': [...],
       'us-east-1e': [...]
@@ -181,7 +181,7 @@ const client = new Eureka({
   eureka: {
     serviceUrls: {
       default: [
-        'http://ec2-fake-552-627-568-165.compute-1.amazonaws.com:7001/eureka/v2/apps/', 'http://ec2-fake-368-101-182-134.compute-1.amazonaws.com:7001/eureka/v2/apps/'
+        'http://ec2-fake-552-627-568-165.compute-1.amazonaws.com:7001/eureka/apps/', 'http://ec2-fake-368-101-182-134.compute-1.amazonaws.com:7001/eureka/apps/'
       ]
     }
   },
@@ -283,7 +283,7 @@ If you are planning on connecting to a eureka service in AWS you will need to ad
 
 ### 404 Not Found Errors from Eureka Server
 
-This probably means that the Eureka REST service is located on a different path in your environment. The default is `http://<EUREKA_HOST>/eureka/v2/apps`, but depending on your setup you may need to set `eureka.servicePath` in your configuration to another path. The REST service could be hung under `/eureka/apps/` or possibly `/apps/`.
+This probably means that the Eureka REST service is located on a different path in your environment. The default is `http://<EUREKA_HOST>/eureka/apps`, but depending on your setup you may need to set `eureka.servicePath` in your configuration to another path. The REST service could be hung under `/eureka/apps/` or possibly `/apps/`.
 
 ### Usage with Spring Cloud
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveord/eureka-js-client",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A JavaScript implementation the Netflix OSS service registry, Eureka.",
   "main": "lib/index.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/coveord/eureka-js-client.git"
   },
   "publishConfig": {
-    "registry":"https://npm.pkg.github.com/"
+    "registry": "https://npm.pkg.github.com/"
   },
   "keywords": [
     "eureka",

diff --git a/test/ConfigClusterResolver.test.js b/test/ConfigClusterResolver.test.js
@@ -32,7 +32,7 @@ describe('Config Cluster Resolver', () => {
 
     it('should return base Eureka URL using configured host', () => {
       resolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://eureka.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://eureka.mydomain.com:9999/eureka/apps/');
       });
     });
   });
@@ -44,9 +44,9 @@ describe('Config Cluster Resolver', () => {
         eureka: {
           serviceUrls: {
             default: [
-              'http://eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://eureka1.mydomain.com:9999/eureka/apps/',
+              'http://eureka2.mydomain.com:9999/eureka/apps/',
+              'http://eureka3.mydomain.com:9999/eureka/apps/',
             ],
           },
         },
@@ -55,16 +55,16 @@ describe('Config Cluster Resolver', () => {
 
     it('should return first Eureka URL from configured serviceUrls', () => {
       resolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://eureka1.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://eureka1.mydomain.com:9999/eureka/apps/');
       });
     });
 
     it('should return next Eureka URL from configured serviceUrls', () => {
       resolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://eureka2.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://eureka2.mydomain.com:9999/eureka/apps/');
         // next attempt should still be the next server
         resolver.resolveEurekaUrl((errTwo, eurekaUrlTwo) => {
-          expect(eurekaUrlTwo).to.equal('http://eureka2.mydomain.com:9999/eureka/v2/apps/');
+          expect(eurekaUrlTwo).to.equal('http://eureka2.mydomain.com:9999/eureka/apps/');
         });
       }, 1);
     });
@@ -80,19 +80,19 @@ describe('Config Cluster Resolver', () => {
           },
           serviceUrls: {
             '1a': [
-              'http://1a-eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://1a-eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://1a-eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://1a-eureka1.mydomain.com:9999/eureka/apps/',
+              'http://1a-eureka2.mydomain.com:9999/eureka/apps/',
+              'http://1a-eureka3.mydomain.com:9999/eureka/apps/',
             ],
             '1b': [
-              'http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://1b-eureka1.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka2.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka3.mydomain.com:9999/eureka/apps/',
             ],
             '1c': [
-              'http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://1b-eureka1.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka2.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka3.mydomain.com:9999/eureka/apps/',
             ],
           },
         },
@@ -101,7 +101,7 @@ describe('Config Cluster Resolver', () => {
 
     it('should return first Eureka URL from configured serviceUrls', () => {
       resolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://1a-eureka1.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://1a-eureka1.mydomain.com:9999/eureka/apps/');
       });
     });
   });
@@ -117,19 +117,19 @@ describe('Config Cluster Resolver', () => {
           },
           serviceUrls: {
             '1a': [
-              'http://1a-eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://1a-eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://1a-eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://1a-eureka1.mydomain.com:9999/eureka/apps/',
+              'http://1a-eureka2.mydomain.com:9999/eureka/apps/',
+              'http://1a-eureka3.mydomain.com:9999/eureka/apps/',
             ],
             '1b': [
-              'http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://1b-eureka1.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka2.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka3.mydomain.com:9999/eureka/apps/',
             ],
             '1c': [
-              'http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka2.mydomain.com:9999/eureka/v2/apps/',
-              'http://1b-eureka3.mydomain.com:9999/eureka/v2/apps/',
+              'http://1b-eureka1.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka2.mydomain.com:9999/eureka/apps/',
+              'http://1b-eureka3.mydomain.com:9999/eureka/apps/',
             ],
           },
         },
@@ -138,7 +138,7 @@ describe('Config Cluster Resolver', () => {
 
     it('should return first Eureka URL from configured serviceUrls', () => {
       resolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://1b-eureka1.mydomain.com:9999/eureka/apps/');
       });
     });
   });
@@ -156,19 +156,19 @@ describe('Config Cluster Resolver', () => {
         },
         serviceUrls: {
           '1a': [
-            'http://1a-eureka1.mydomain.com:9999/eureka/v2/apps/',
-            'http://1a-eureka2.mydomain.com:9999/eureka/v2/apps/',
-            'http://1a-eureka3.mydomain.com:9999/eureka/v2/apps/',
+            'http://1a-eureka1.mydomain.com:9999/eureka/apps/',
+            'http://1a-eureka2.mydomain.com:9999/eureka/apps/',
+            'http://1a-eureka3.mydomain.com:9999/eureka/apps/',
           ],
           '1b': [
-            'http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/',
-            'http://1b-eureka2.mydomain.com:9999/eureka/v2/apps/',
-            'http://1b-eureka3.mydomain.com:9999/eureka/v2/apps/',
+            'http://1b-eureka1.mydomain.com:9999/eureka/apps/',
+            'http://1b-eureka2.mydomain.com:9999/eureka/apps/',
+            'http://1b-eureka3.mydomain.com:9999/eureka/apps/',
           ],
           '1c': [
-            'http://1b-eureka1.mydomain.com:9999/eureka/v2/apps/',
-            'http://1b-eureka2.mydomain.com:9999/eureka/v2/apps/',
-            'http://1b-eureka3.mydomain.com:9999/eureka/v2/apps/',
+            'http://1b-eureka1.mydomain.com:9999/eureka/apps/',
+            'http://1b-eureka2.mydomain.com:9999/eureka/apps/',
+            'http://1b-eureka3.mydomain.com:9999/eureka/apps/',
           ],
         },
       },
@@ -179,7 +179,7 @@ describe('Config Cluster Resolver', () => {
 
     it('should return first Eureka URL from configured serviceUrls', () => {
       resolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://1a-eureka1.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://1a-eureka1.mydomain.com:9999/eureka/apps/');
       });
     });
   });

diff --git a/test/DnsClusterResolver.test.js b/test/DnsClusterResolver.test.js
@@ -16,7 +16,7 @@ function makeConfig(overrides = {}) {
     },
     eureka: {
       host: 'eureka.mydomain.com',
-      servicePath: '/eureka/v2/apps/',
+      servicePath: '/eureka/apps/',
       port: 9999,
       maxRetries: 0,
       ec2Region: 'my-region',
@@ -90,15 +90,15 @@ describe('DNS Cluster Resolver', () => {
       const resolveHostsStub = sinon.stub(dnsResolver, 'resolveClusterHosts');
       resolveHostsStub.yields(null, ['a.mydomain.com', 'b.mydomain.com', 'c.mydomain.com']);
       dnsResolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://a.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://a.mydomain.com:9999/eureka/apps/');
       });
     });
 
     it('should return base Eureka URL using next cluster host on retry', () => {
       const resolveHostsStub = sinon.stub(dnsResolver, 'resolveClusterHosts');
       resolveHostsStub.yields(null, ['a.mydomain.com', 'b.mydomain.com', 'c.mydomain.com']);
       dnsResolver.resolveEurekaUrl((err, eurekaUrl) => {
-        expect(eurekaUrl).to.equal('http://b.mydomain.com:9999/eureka/v2/apps/');
+        expect(eurekaUrl).to.equal('http://b.mydomain.com:9999/eureka/apps/');
         expect(dnsResolver.serverList).to.eql(['b.mydomain.com', 'c.mydomain.com',
           'a.mydomain.com']);
       }, 1);
@@ -244,7 +244,7 @@ describe('DNS Cluster Resolver', () => {
         eureka: {
           preferSameZone: true,
           host: 'eureka.mydomain.com',
-          servicePath: '/eureka/v2/apps/',
+          servicePath: '/eureka/apps/',
           port: 9999,
           maxRetries: 0,
           ec2Region: 'my-region',

diff --git a/test/EurekaClient.test.js b/test/EurekaClient.test.js
@@ -390,7 +390,7 @@ describe('Eureka client', () => {
           },
         },
         json: true,
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: 'app',
       });
 
@@ -442,7 +442,7 @@ describe('Eureka client', () => {
       client.deregister(deregisterCb);
 
       expect(request.delete).to.have.been.calledWithMatch({
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: 'app/myhost',
       });
 
@@ -485,7 +485,7 @@ describe('Eureka client', () => {
       client.renew();
 
       expect(request.put).to.have.been.calledWithMatch({
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: 'app/myhost',
       });
     });
@@ -505,7 +505,7 @@ describe('Eureka client', () => {
       client.renew();
 
       expect(request.put).to.have.been.calledWithMatch({
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: 'app/myhost',
       });
 
@@ -521,7 +521,7 @@ describe('Eureka client', () => {
           },
         },
         json: true,
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: 'app',
       });
     });
@@ -711,7 +711,7 @@ describe('Eureka client', () => {
       client.fetchRegistry(registryCb);
 
       expect(request.get).to.have.been.calledWithMatch({
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: '',
         headers: { Accept: 'application/json' },
       });
@@ -727,7 +727,7 @@ describe('Eureka client', () => {
       client.fetchRegistry(registryCb);
 
       expect(request.get).to.have.been.calledWithMatch({
-        baseUrl: 'http://127.0.0.1:9999/eureka/v2/apps/',
+        baseUrl: 'http://127.0.0.1:9999/eureka/apps/',
         uri: 'delta',
         headers: { Accept: 'application/json' },
       });

diff --git a/test/eureka-client.yml b/test/eureka-client.yml
@@ -4,7 +4,7 @@ eureka:
   heartbeatInterval: 999
   registryFetchInterval: 999
   fetchRegistry: false
-  servicePath: '/eureka/v2/apps/'
+  servicePath: '/eureka/apps/'
   ssl: false
   useDns: false
   fetchMetadata: false

diff --git a/test/integration.test.js b/test/integration.test.js
@@ -18,7 +18,7 @@ describe('Integration Test', () => {
       registryFetchInterval: 5000,
       fetchRegistry: true,
       waitForRegistry: true,
-      servicePath: '/eureka/v2/apps/',
+      servicePath: '/eureka/apps/',
       ssl: false,
       useDns: false,
       fetchMetadata: true,