navy 4.1.2-rc.2 → 5.0.0

package/lib/middleware/port-override.js

@@ -1,49 +1,27 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
-
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _lodash = require('lodash');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _lodash = require("lodash");
 
 function getPortConfig(serviceName, state) {
   return state.services[serviceName] ? state.services[serviceName]._ports || {} : {};
 }
 
-exports.default = function (config, state) {
-  return (0, _extends3.default)({}, config, {
-    services: (0, _lodash.mapValues)(config.services, function (service, serviceName) {
-      var portConfig = getPortConfig(serviceName, state);
-      var hasPortConfig = !!portConfig;
-      var internalPorts = (0, _keys2.default)(portConfig).filter(function (internal) {
-        return !!portConfig[internal];
-      });
-
-      var inheritedPorts = service.ports ? service.ports.filter(function (port) {
-        return internalPorts.indexOf(port) === -1;
-      }) : [];
-
-      return (0, _extends3.default)({}, service, {
-        ports: hasPortConfig ? [].concat((0, _toConsumableArray3.default)(inheritedPorts), (0, _toConsumableArray3.default)(internalPorts.map(function (internal) {
-          return portConfig[internal] + ':' + internal;
-        }))) : service.ports
-      });
-    })
-  });
-};
+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
+    };
+  })
+});
 
+exports.default = _default;
 module.exports = exports.default;

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

@@ -1,26 +1,22 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _lodash = require("lodash");
 
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _lodash = require('lodash');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function (config, state) {
-  return (0, _extends3.default)({}, config, {
-    services: (0, _lodash.mapValues)(config.services, function (serviceConfig, serviceName) {
-      var serviceState = state.services[serviceName] || {};
-      return (0, _extends3.default)({}, serviceConfig, {
-        environment: (0, _extends3.default)({}, serviceConfig.environment, serviceState.environment)
-      });
-    })
-  });
-};
+var _default = (config, state) => ({ ...config,
+  services: (0, _lodash.mapValues)(config.services, (serviceConfig, serviceName) => {
+    const serviceState = state.services[serviceName] || {};
+    return { ...serviceConfig,
+      environment: { ...serviceConfig.environment,
+        ...serviceState.environment
+      }
+    };
+  })
+});
 
+exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/set-image.js

@@ -1,26 +1,20 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _lodash = require("lodash");
 
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _lodash = require('lodash');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function (config, state) {
-  return (0, _extends3.default)({}, config, {
-    services: (0, _lodash.mapValues)(config.services, function (serviceConfig, serviceName) {
-      var serviceState = state.services[serviceName] || {};
-      return (0, _extends3.default)({}, serviceConfig, {
-        image: serviceState.image || serviceConfig.image
-      });
-    })
-  });
-};
+var _default = (config, state) => ({ ...config,
+  services: (0, _lodash.mapValues)(config.services, (serviceConfig, serviceName) => {
+    const serviceState = state.services[serviceName] || {};
+    return { ...serviceConfig,
+      image: serviceState.image || serviceConfig.image
+    };
+  })
+});
 
+exports.default = _default;
 module.exports = exports.default;

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

@@ -1,26 +1,22 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _lodash = require("lodash");
 
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _lodash = require('lodash');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function (config, state) {
-  return (0, _extends3.default)({}, config, {
-    services: (0, _lodash.mapValues)(config.services, function (serviceConfig, serviceName) {
-      var serviceState = state.services[serviceName] || {};
-      return (0, _extends3.default)({}, serviceConfig, {
-        logging: (0, _extends3.default)({}, serviceConfig.logging, serviceState.logging)
-      });
-    })
-  });
-};
+var _default = (config, state) => ({ ...config,
+  services: (0, _lodash.mapValues)(config.services, (serviceConfig, serviceName) => {
+    const serviceState = state.services[serviceName] || {};
+    return { ...serviceConfig,
+      logging: { ...serviceConfig.logging,
+        ...serviceState.logging
+      }
+    };
+  })
+});
 
+exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/tag-override.js

@@ -1,38 +1,30 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function (config, state) {
-  var newConfig = config;
-
-  (0, _keys2.default)(state.services || {}).forEach(function (serviceName) {
-    var serviceConfig = newConfig.services[serviceName];
-    var serviceState = state.services[serviceName];
+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) {
-      var image = serviceConfig.image;
+      let image = serviceConfig.image; // strip existing tag off if it exists
 
-      // 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;
 
+      image += ':' + serviceState._tag;
       serviceConfig.image = image;
     }
   });
-
   return newConfig;
 };
 
+exports.default = _default;
 module.exports = exports.default;

package/lib/navy/default-middleware.js

@@ -1,41 +1,27 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _develop = require('../middleware/develop');
-
-var _develop2 = _interopRequireDefault(_develop);
-
-var _tagOverride = require('../middleware/tag-override');
-
-var _tagOverride2 = _interopRequireDefault(_tagOverride);
-
-var _portOverride = require('../middleware/port-override');
-
-var _portOverride2 = _interopRequireDefault(_portOverride);
-
-var _addVirtualHosts = require('../middleware/add-virtual-hosts');
-
-var _addVirtualHosts2 = _interopRequireDefault(_addVirtualHosts);
-
-var _setEnvVars = require('../middleware/set-env-vars');
+var _develop = _interopRequireDefault(require("../middleware/develop"));
 
-var _setEnvVars2 = _interopRequireDefault(_setEnvVars);
+var _tagOverride = _interopRequireDefault(require("../middleware/tag-override"));
 
-var _setLoggingDriver = require('../middleware/set-logging-driver');
+var _portOverride = _interopRequireDefault(require("../middleware/port-override"));
 
-var _setLoggingDriver2 = _interopRequireDefault(_setLoggingDriver);
+var _addServiceProxyConfig = _interopRequireDefault(require("../middleware/add-service-proxy-config"));
 
-var _setImage = require('../middleware/set-image');
+var _setEnvVars = _interopRequireDefault(require("../middleware/set-env-vars"));
 
-var _setImage2 = _interopRequireDefault(_setImage);
+var _setLoggingDriver = _interopRequireDefault(require("../middleware/set-logging-driver"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _setImage = _interopRequireDefault(require("../middleware/set-image"));
 
-exports.default = function (navy) {
-  return [_develop2.default, _tagOverride2.default, _portOverride2.default, _setEnvVars2.default, _setLoggingDriver2.default, _setImage2.default, (0, _addVirtualHosts2.default)(navy)];
-};
+var _default = navy => [_develop.default, _tagOverride.default, _portOverride.default, _setEnvVars.default, _setLoggingDriver.default, _setImage.default, (0, _addServiceProxyConfig.default)(navy)];
 
+exports.default = _default;
 module.exports = exports.default;