config 3.2.4 → 3.2.5

package/History.md

@@ -1,3 +1,8 @@
+3.2.5 / 2020-01-16
+==================
+
+  * Fixed issue with getCustomEnvVars and multiple config dirs #585 - @dekelev
+
 3.2.4 / 2019-10-25
 ==================
 

package/README.md

@@ -126,7 +126,7 @@ Articles
 
 Further Information
 ---------------------
-If you still don't see what you are looking for, here more resources to check: 
+If you still don't see what you are looking for, here are some more resources to check: 
 
  * The [wiki may have more pages](https://github.com/lorenwest/node-config/wiki) which are not directly linked from here.
  * Review [questions tagged with node-config](https://stackexchange.com/filters/207096/node-config) on StackExchange. These are monitored by `node-config` contributors.

package/lib/config.js

@@ -1073,8 +1073,13 @@ util.substituteDeep = function (substitutionMap, variables) {
  */
 util.getCustomEnvVars = function (CONFIG_DIR, extNames) {
   var result = {};
+  var resolutionIndex = 1;
+  var allowedFiles = {};
   extNames.forEach(function (extName) {
-    var fullFilename = Path.join(CONFIG_DIR , 'custom-environment-variables' + '.' + extName);
+    allowedFiles['custom-environment-variables' + '.' + extName] = resolutionIndex++;
+  });
+  var locatedFiles = util.locateMatchingFiles(CONFIG_DIR, allowedFiles);
+  locatedFiles.forEach(function (fullFilename) {
     var configObj = util.parseFile(fullFilename);
     if (configObj) {
       var environmentSubstitutions = util.substituteDeep(configObj, process.env);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "config",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "main": "./lib/config.js",
   "description": "Configuration control for production node deployments",
   "author": "Loren West <open_source@lorenwest.com>",