@johnmmackey/ms-utils 4.0.1 → 4.1.1

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 4.1.0
+Added functionality:
+* uses ```dotenv``` to load a local .env file
+* pushes configuration into environment variables
+
 ## Version 4.0.0
 BREAKING CHANGES
 * @johnmmackey/amqp-utils removed as a dependency

package/README.md

@@ -28,7 +28,6 @@ let x = Config.get('key');      //typeof string
 let y = Config.getObj('key');   // typeof Object
 
 sendmail(
-    [
         {"email": "user1@gmail.com","name": "John Smith"},
         {"email": "user2@yahoo.com","name": "Jane Doe"},
         {"email": "user3@aol.com","name": "Karen from Texas"}
@@ -42,6 +41,14 @@ sendmail(
     .then( () => console.log('Success'))
     .catch( err => console.log(err))
 ```
+
+##
+```Config.load``` now has 2 side effects:
+* 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: .env > etcd > external set environment
+
 ## Future
 * Add local queueing for log events when AMQP is not operative.
 * Configurable logging setup (drivers)

package/lib/config.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { Etcd3 } = require('etcd3');
+const dotenv = require('dotenv');
 const client = new Etcd3({ hosts: process.env.ETCD_URI || 'http://localhost:2379' });
 
 
@@ -24,7 +25,14 @@ async function tryLoad(serviceName) {
 }
 
 async function load(serviceName) {
-    return Promise.retry(10, tryLoad.bind(this, serviceName), 5000)
+    await Promise.retry(10, tryLoad.bind(this, 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
+    dotenv.config({ override: true });
+    return config;
 }
 
 function get(k) {
@@ -34,10 +42,10 @@ function get(k) {
 function getObj(k) {
     try {
         return JSON.parse(config[k]);
-     }
-     catch (err) {
-         return null;
-     }
+    }
+    catch (err) {
+        return null;
+    }
 }
 
 module.exports = { load, get, getObj }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnmmackey/ms-utils",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "description": "Utility functions for Microservice Architecture",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/52westlabs/ms-utils#readme",
   "dependencies": {
+    "dotenv": "^16.4.7",
     "etcd3": "^1.1.2",
     "redis": "^4.6.12",
     "uuid": "^9.0.1"

package/tests/priorityTest.js

@@ -0,0 +1,9 @@
+const { Config } = require('../index.js');
+
+( async () => {
+    console.log('env: before network load', process.env)
+    let config = await Config.load('mailrelay')
+    console.log('env: after network and file load', process.env)
+
+
+})()