navy 6.0.0 → 7.0.0-alpha.2

package/lib/middleware/develop.js

@@ -4,20 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _helpers = require("./helpers");
-
 function rewriteService(service, serviceName, serviceState) {
   if (!serviceState || !serviceState._develop) return service;
   const _serviceState = serviceState;
-  return { ...service,
+  return {
+    ...service,
     stdin_open: true,
     volumes: _helpers.middlewareHelpers.addVolumes(service, Object.keys(serviceState._develop.mounts).map(local => `${local}:${_serviceState._develop.mounts[local]}`)),
     command: serviceState._develop.command ? serviceState._develop.command : service.command
   };
 }
-
 var _default = (config, state) => _helpers.middlewareHelpers.rewriteServicesWithState(config, state, rewriteService);
-
 exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/helpers.js

@@ -4,34 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.middlewareHelpers = void 0;
-
 var _lodash = require("lodash");
-
-const middlewareHelpers = {
+const middlewareHelpers = exports.middlewareHelpers = {
   rewriteServices(config, serviceMapperFn) {
-    return { ...config,
+    return {
+      ...config,
       services: (0, _lodash.mapValues)(config.services || {}, serviceMapperFn)
     };
   },
-
   rewriteServicesWithState(config, state, serviceMapperFn) {
     const normalisedState = state || {
       services: {}
     };
-
     function mapperFn(service, serviceName) {
       return serviceMapperFn(service, serviceName, normalisedState.services[serviceName]);
     }
-
-    return { ...config,
+    return {
+      ...config,
       services: (0, _lodash.mapValues)(config.services || {}, mapperFn)
     };
   },
-
   addVolumes(service, volumes) {
     const normalisedVolumes = service.volumes || [];
     return [...normalisedVolumes, ...volumes];
   }
-
-};
-exports.middlewareHelpers = middlewareHelpers;
+};

package/lib/middleware/port-override.js

@@ -4,24 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _lodash = require("lodash");
-
 function getPortConfig(serviceName, state) {
   return state.services[serviceName] ? state.services[serviceName]._ports || {} : {};
 }
-
-var _default = (config, state) => ({ ...config,
+var _default = (config, state) => ({
+  ...config,
   services: (0, _lodash.mapValues)(config.services, (service, serviceName) => {
     const portConfig = getPortConfig(serviceName, state);
-    const hasPortConfig = !!portConfig;
     const internalPorts = Object.keys(portConfig).filter(internal => !!portConfig[internal]);
     const inheritedPorts = service.ports ? service.ports.filter(port => internalPorts.indexOf(port) === -1) : [];
-    return { ...service,
-      ports: hasPortConfig ? [...inheritedPorts, ...internalPorts.map(internal => `${portConfig[internal]}:${internal}`)] : service.ports
+    return {
+      ...service,
+      ports: [...inheritedPorts, ...internalPorts.map(internal => `${portConfig[internal]}:${internal}`)]
     };
   })
 });
-
 exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/set-env-vars.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _lodash = require("lodash");
-
-var _default = (config, state) => ({ ...config,
+var _default = (config, state) => ({
+  ...config,
   services: (0, _lodash.mapValues)(config.services, (serviceConfig, serviceName) => {
     const serviceState = state.services[serviceName] || {};
-    return { ...serviceConfig,
-      environment: { ...serviceConfig.environment,
+    return {
+      ...serviceConfig,
+      environment: {
+        ...serviceConfig.environment,
         ...serviceState.environment
       }
     };
   })
 });
-
 exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/set-image.js

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _lodash = require("lodash");
-
-var _default = (config, state) => ({ ...config,
+var _default = (config, state) => ({
+  ...config,
   services: (0, _lodash.mapValues)(config.services, (serviceConfig, serviceName) => {
     const serviceState = state.services[serviceName] || {};
-    return { ...serviceConfig,
+    return {
+      ...serviceConfig,
       image: serviceState.image || serviceConfig.image
     };
   })
 });
-
 exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/set-logging-driver.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _lodash = require("lodash");
-
-var _default = (config, state) => ({ ...config,
+var _default = (config, state) => ({
+  ...config,
   services: (0, _lodash.mapValues)(config.services, (serviceConfig, serviceName) => {
     const serviceState = state.services[serviceName] || {};
-    return { ...serviceConfig,
-      logging: { ...serviceConfig.logging,
+    return {
+      ...serviceConfig,
+      logging: {
+        ...serviceConfig.logging,
         ...serviceState.logging
       }
     };
   })
 });
-
 exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/tag-override.js

@@ -4,27 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _default = (config, state) => {
   const newConfig = config;
   Object.keys(state.services || {}).forEach(function (serviceName) {
     const serviceConfig = newConfig.services[serviceName];
     const serviceState = state.services[serviceName];
-
     if (serviceState._tag && serviceConfig) {
-      let image = serviceConfig.image; // strip existing tag off if it exists
+      let image = serviceConfig.image;
 
+      // strip existing tag off if it exists
       if (image.indexOf(':') !== -1) {
         image = image.substring(0, image.indexOf(':'));
-      } // add new tag
-
+      }
 
+      // add new tag
       image += ':' + serviceState._tag;
       serviceConfig.image = image;
     }
   });
   return newConfig;
 };
-
 exports.default = _default;
 module.exports = exports.default;

package/lib/navy/__tests__/default-middleware.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _chai = require("chai");
+var _defaultMiddleware = _interopRequireDefault(require("../default-middleware"));
+var _develop = _interopRequireDefault(require("../../middleware/develop"));
+var _tagOverride = _interopRequireDefault(require("../../middleware/tag-override"));
+var _portOverride = _interopRequireDefault(require("../../middleware/port-override"));
+var _setEnvVars = _interopRequireDefault(require("../../middleware/set-env-vars"));
+var _setLoggingDriver = _interopRequireDefault(require("../../middleware/set-logging-driver"));
+var _setImage = _interopRequireDefault(require("../../middleware/set-image"));
+var _addServiceProxyConfig = _interopRequireDefault(require("../../middleware/add-service-proxy-config"));
+/* eslint-env mocha */
+
+describe('default-middleware', function () {
+  it('should return the standard middleware pipeline in the documented order', function () {
+    const fakeNavy = {
+      name: 'env',
+      normalisedName: 'env'
+    };
+    const list = (0, _defaultMiddleware.default)(fakeNavy);
+    (0, _chai.expect)(list).to.have.lengthOf(7);
+    (0, _chai.expect)(list[0]).to.equal(_develop.default);
+    (0, _chai.expect)(list[1]).to.equal(_tagOverride.default);
+    (0, _chai.expect)(list[2]).to.equal(_portOverride.default);
+    (0, _chai.expect)(list[3]).to.equal(_setEnvVars.default);
+    (0, _chai.expect)(list[4]).to.equal(_setLoggingDriver.default);
+    (0, _chai.expect)(list[5]).to.equal(_setImage.default);
+    (0, _chai.expect)(list[6]).to.be.a('function');
+  });
+  it('should bind the navy through to the addServiceProxy middleware factory', function () {
+    const fakeNavy = {
+      name: 'env',
+      normalisedName: 'env'
+    };
+    const list = (0, _defaultMiddleware.default)(fakeNavy);
+    const expected = (0, _addServiceProxyConfig.default)(fakeNavy);
+    (0, _chai.expect)(typeof list[6]).to.equal(typeof expected);
+  });
+});