navy 7.0.0-alpha.4 → 7.0.0

package/lib/navy/__tests__/index.js

@@ -776,6 +776,148 @@ describe('navy/index', function () {
       (0, _chai.expect)(driver.destroy.calledOnce).to.equal(true);
       (0, _chai.expect)(deleteState.calledOnce).to.equal(true);
     });
+    it('should pass navyFile from a remaining navy when reconfiguring the proxy', async function () {
+      const driver = makeDriver();
+      const envPath = '/abs/env/Navyfile.js';
+      const otherPath = '/abs/other/Navyfile.js';
+      const destroyedNavyFile = {
+        httpProxyImage: 'destroyed/proxy:1'
+      };
+      const remainingNavyFile = {
+        httpProxyImage: 'remaining/proxy:1',
+        httpProxyEnv: {
+          FOO: 'bar'
+        }
+      };
+      const createProvider = path => ({
+        getNavyFilePath: async () => path
+      });
+      const resolveConfigProvider = _sinon.default.stub().callsFake(() => navy => createProvider(navy.normalisedName === 'other' ? otherPath : envPath));
+      const reconfigureHTTPProxy = _sinon.default.stub().resolves();
+      const deleteState = _sinon.default.stub().resolves();
+      const {
+        Navy
+      } = _proxyquire.default.noCallThru()('../', {
+        '../util/fs': {
+          readdirAsync: _sinon.default.stub().resolves(['env', 'other']),
+          lstatSync: _sinon.default.stub().returns({
+            isDirectory: () => true
+          })
+        },
+        './state': {
+          getState: _sinon.default.stub().resolves({
+            driver: 'docker-compose',
+            configProvider: 'filesystem'
+          }),
+          saveState: _sinon.default.stub().resolves(),
+          deleteState,
+          pathToNavys: _sinon.default.stub().returns('/home/test/.navy/navies'),
+          pathToNavy: _sinon.default.stub().callsFake(n => `/home/test/.navy/navies/${n}`)
+        },
+        '../driver': {
+          resolveDriverFromName: _sinon.default.stub().returns(() => driver)
+        },
+        '../config-provider': {
+          resolveConfigProviderFromName: resolveConfigProvider
+        },
+        '../config': {
+          getConfig: _sinon.default.stub().returns({
+            externalIP: null
+          })
+        },
+        './plugin-interface': {
+          loadPlugins: _sinon.default.stub().resolves([])
+        },
+        './middleware': {
+          middlewareRunner: _sinon.default.stub().resolves()
+        },
+        '../http-proxy': {
+          reconfigureHTTPProxy
+        },
+        '../util/external-ip': {
+          getExternalIP: _sinon.default.stub().resolves('127.0.0.1')
+        },
+        '../util/service-host': {
+          createUrlForService: _sinon.default.stub().resolves('http://svc.local'),
+          getUrlFromService: _sinon.default.stub().returns(null)
+        },
+        [envPath]: destroyedNavyFile,
+        [otherPath]: remainingNavyFile
+      });
+      await new Navy('env').destroy();
+      (0, _chai.expect)(reconfigureHTTPProxy.calledOnce).to.equal(true);
+      (0, _chai.expect)(reconfigureHTTPProxy.firstCall.args[0].navies).to.eql(['other']);
+      (0, _chai.expect)(reconfigureHTTPProxy.firstCall.args[0].navyFile).to.eql(remainingNavyFile);
+    });
+    it('should skip uninitialised remaining navies when resolving navyFile for the proxy', async function () {
+      const driver = makeDriver();
+      const otherPath = '/abs/other/Navyfile.js';
+      const remainingNavyFile = {
+        httpProxyImage: 'remaining/proxy:1'
+      };
+      const createProvider = path => ({
+        getNavyFilePath: async () => path
+      });
+      const resolveConfigProvider = _sinon.default.stub().callsFake(() => navy => createProvider(navy.normalisedName === 'other' ? otherPath : '/abs/env/Navyfile.js'));
+      const reconfigureHTTPProxy = _sinon.default.stub().resolves();
+      const deleteState = _sinon.default.stub().resolves();
+      const getState = _sinon.default.stub().callsFake(name => {
+        if (name === 'uninit') return Promise.resolve(null);
+        return Promise.resolve({
+          driver: 'docker-compose',
+          configProvider: 'filesystem'
+        });
+      });
+      const {
+        Navy
+      } = _proxyquire.default.noCallThru()('../', {
+        '../util/fs': {
+          readdirAsync: _sinon.default.stub().resolves(['env', 'uninit', 'other']),
+          lstatSync: _sinon.default.stub().returns({
+            isDirectory: () => true
+          })
+        },
+        './state': {
+          getState,
+          saveState: _sinon.default.stub().resolves(),
+          deleteState,
+          pathToNavys: _sinon.default.stub().returns('/home/test/.navy/navies'),
+          pathToNavy: _sinon.default.stub().callsFake(n => `/home/test/.navy/navies/${n}`)
+        },
+        '../driver': {
+          resolveDriverFromName: _sinon.default.stub().returns(() => driver)
+        },
+        '../config-provider': {
+          resolveConfigProviderFromName: resolveConfigProvider
+        },
+        '../config': {
+          getConfig: _sinon.default.stub().returns({
+            externalIP: null
+          })
+        },
+        './plugin-interface': {
+          loadPlugins: _sinon.default.stub().resolves([])
+        },
+        './middleware': {
+          middlewareRunner: _sinon.default.stub().resolves()
+        },
+        '../http-proxy': {
+          reconfigureHTTPProxy
+        },
+        '../util/external-ip': {
+          getExternalIP: _sinon.default.stub().resolves('127.0.0.1')
+        },
+        '../util/service-host': {
+          createUrlForService: _sinon.default.stub().resolves('http://svc.local'),
+          getUrlFromService: _sinon.default.stub().returns(null)
+        },
+        [otherPath]: remainingNavyFile
+      });
+      await new Navy('env').destroy();
+      (0, _chai.expect)(reconfigureHTTPProxy.calledOnce).to.equal(true);
+      (0, _chai.expect)(reconfigureHTTPProxy.firstCall.args[0].navies).to.eql(['uninit', 'other']);
+      (0, _chai.expect)(reconfigureHTTPProxy.firstCall.args[0].navyFile).to.eql(remainingNavyFile);
+    });
     it('should still delete state even when driver.destroy throws', async function () {
       const driver = makeDriver({
         destroy: _sinon.default.stub().rejects(new Error('boom'))

package/lib/navy/index.js

@@ -237,9 +237,10 @@ class Navy extends _eventemitter.EventEmitter2 {
     if (!(await this.isInitialised())) {
       throw new _errors.NavyNotInitialisedError(this.name);
     }
+    const remainingNavyNames = (await getLaunchedNavyNames()).filter(navy => navy !== this.normalisedName);
     await (0, _httpProxy.reconfigureHTTPProxy)({
-      navies: (await getLaunchedNavyNames()).filter(navy => navy !== this.normalisedName),
-      navyFile: await this.getNavyFile()
+      navies: remainingNavyNames,
+      navyFile: await getNavyFileFromNavies(remainingNavyNames)
     });
     try {
       await (await this.safeGetDriver()).destroy();
@@ -499,6 +500,15 @@ function getNavy(navyName) {
   (0, _invariant.default)(navyName, "NO_NAVY_PROVIDED: No Navy provided");
   return new Navy(navyName);
 }
+async function getNavyFileFromNavies(navyNames) {
+  for (const navyName of navyNames) {
+    const navy = getNavy(navyName);
+    if (!(await navy.isInitialised())) continue;
+    const navyFile = await navy.getNavyFile();
+    if (navyFile) return navyFile;
+  }
+  return null;
+}
 
 /**
  * Returns an array of `Navy` instances which are currently imported and launched.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navy",
-  "version": "7.0.0-alpha.4",
+  "version": "7.0.0",
   "description": "Quick and powerful development environments using Docker and Docker Compose",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",