@johnmmackey/ms-utils 4.2.0 → 4.3.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 4.3.0
+* Ensure .env is the highest priority
+
+## Version 4.2.1
+* Bug fix on load
+
 ## Version 4.2.0
 
 Added a self contained, simpler mail function:

package/README.md

@@ -47,7 +47,7 @@ sendmail(
 * uses ```dotenv``` to load a .env file in the current working directory into the environment
 * pushes all items loaded from etcd into the environment.
 
-The order of precedence: etcd > .env > external set environment
+The order of precedence: .env > .env > externally set environment
 
 ## Future
 * Add local queueing for log events when AMQP is not operative.

package/lib/config.js

@@ -2,8 +2,6 @@
 
 const { Etcd3 } = require('etcd3');
 const dotenv = require('dotenv');
-const client = new Etcd3({ hosts: process.env.ETCD_URI || 'http://localhost:2379' });
-
 
 // helpers
 // https://stackoverflow.com/questions/42429590/retry-on-javascript-promise-reject-a-limited-number-of-times-or-until-success
@@ -12,7 +10,7 @@ Promise.retry = (cont, fn, delay) => fn().catch(err => cont > 0 ? Promise.wait(d
 
 var config = {};
 
-async function tryLoad(serviceName) {
+async function tryLoad(client, serviceName) {
     let scoped = await client
         .namespace(`${process.env.CONFIG_SET || ''}/${serviceName}/`)
         .getAll()
@@ -29,10 +27,17 @@ async function load(serviceName) {
     // load any .env file that may be present into the environment
     dotenv.config({ override: true });
 
-    await Promise.retry(10, tryLoad.bind(this, serviceName), 5000);
+    const client = new Etcd3({ hosts: process.env.ETCD_URI || 'http://localhost:2379' });
+
+    await Promise.retry(10, tryLoad.bind(this, client, serviceName), 5000);
 
     // as a side-effect, load these into process.env
     dotenv.populate(process.env, config, { override: true });
+    
+    // load any .env file that may be present into the environment
+    // again to override
+    // why? the first one may be necessary to find an etcd server...
+    dotenv.config({ override: true });
     return config;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnmmackey/ms-utils",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Utility functions for Microservice Architecture",
   "main": "index.js",
   "scripts": {