reimplement $(env var) replace to share common code.

and add test to utils

red/runtime/nodes/flows/Flow.js

@@ -259,32 +259,6 @@ function Flow(global,flow) {
             }
         }
     }
-
-}
-
-var EnvVarPropertyRE = /^\$\((\S+)\)$/;
-
-function mapEnvVarProperties(obj,prop) {
-    if (Buffer.isBuffer(obj[prop])) {
-        return;
-    } else if (Array.isArray(obj[prop])) {
-        for (var i=0;i<obj[prop].length;i++) {
-            mapEnvVarProperties(obj[prop],i);
-        }
-    } else if (typeof obj[prop] === 'string') {
-        var m;
-        if ( (m = EnvVarPropertyRE.exec(obj[prop])) !== null) {
-            if (process.env.hasOwnProperty(m[1])) {
-                obj[prop] = process.env[m[1]];
-            }
-        }
-    } else {
-        for (var p in obj[prop]) {
-            if (obj[prop].hasOwnProperty(p)) {
-                mapEnvVarProperties(obj[prop],p);
-            }
-        }
-    }
 }
 
 function createNode(type,config) {
@@ -295,7 +269,7 @@ function createNode(type,config) {
         delete conf.credentials;
         for (var p in conf) {
             if (conf.hasOwnProperty(p)) {
-                mapEnvVarProperties(conf,p);
+                flowUtil.mapEnvVarProperties(conf,p);
             }
         }
         try {

red/runtime/nodes/flows/util.js

@@ -37,9 +37,35 @@ function diffNodes(oldNode,newNode) {
     return false;
 }
 
+var EnvVarPropertyRE = /^\$\((\S+)\)$/;
+
+function mapEnvVarProperties(obj,prop) {
+    if (Buffer.isBuffer(obj[prop])) {
+        return;
+    } else if (Array.isArray(obj[prop])) {
+        for (var i=0;i<obj[prop].length;i++) {
+            mapEnvVarProperties(obj[prop],i);
+        }
+    } else if (typeof obj[prop] === 'string') {
+        var m;
+        if ( (m = EnvVarPropertyRE.exec(obj[prop])) !== null) {
+            if (process.env.hasOwnProperty(m[1])) {
+                obj[prop] = process.env[m[1]];
+            }
+        }
+    } else {
+        for (var p in obj[prop]) {
+            if (obj[prop].hasOwnProperty(p)) {
+                mapEnvVarProperties(obj[prop],p);
+            }
+        }
+    }
+}
+
 module.exports = {
 
     diffNodes: diffNodes,
+    mapEnvVarProperties: mapEnvVarProperties,
 
     parseConfig: function(config) {
         var flow = {};
@@ -301,7 +327,7 @@ module.exports = {
                     }
                 }
             }
-        } while(madeChange===true)
+        } while (madeChange===true)
 
         // Find any nodes that exist on a subflow template and remove from changed
         // list as the parent subflow will now be marked as containing a change
@@ -316,7 +342,7 @@ module.exports = {
 
         // Recursively mark all instances of changed subflows as changed
         var changedSubflowStack = Object.keys(changedSubflows);
-        while(changedSubflowStack.length > 0) {
+        while (changedSubflowStack.length > 0) {
             var subflowId = changedSubflowStack.pop();
             for (id in newConfig.allNodes) {
                 if (newConfig.allNodes.hasOwnProperty(id)) {
@@ -350,7 +376,7 @@ module.exports = {
         // Traverse the links of all modified nodes to mark the connected nodes
         var modifiedNodes = diff.added.concat(diff.changed).concat(diff.removed).concat(diff.rewired);
         var visited = {};
-        while(modifiedNodes.length > 0) {
+        while (modifiedNodes.length > 0) {
             node = modifiedNodes.pop();
             if (!visited[node]) {
                 visited[node] = true;

red/runtime/nodes/index.js

@@ -21,6 +21,7 @@ var fs = require("fs");
 var registry = require("./registry");
 var credentials = require("./credentials");
 var flows = require("./flows");
+var flowUtil = require("./flows/util")
 var context = require("./context");
 var Node = require("./Node");
 var log = require("../log");
@@ -70,19 +71,11 @@ function createNode(node,def) {
     if (creds) {
         //console.log("Attaching credentials to ",node.id);
         // allow $(foo) syntax to substitute env variables for credentials also...
-        var EnvVarPropertyRE = /^\$\((\S+)\)$/;
-        var loopOver = function (obj) {
-            for (var o in obj) {
-                if (typeof obj[o] === "object" && obj[o] !== null) { loopOver(obj[o]); }
-                else {
-                    var m;
-                    if ( (m = EnvVarPropertyRE.exec(obj[o])) !== null ) {
-                        if (process.env.hasOwnProperty(m[1])) { obj[o] = process.env[m[1]]; }
-                    }
-                }
+        for (var p in creds) {
+            if (creds.hasOwnProperty(p)) {
+                flowUtil.mapEnvVarProperties(creds,p);
             }
         }
-        loopOver(creds);
         node.credentials = creds;
     } else if (credentials.getDefinition(node.type)) {
         node.credentials = {};
@@ -160,7 +153,6 @@ module.exports = {
     // disableFlow: flows.disableFlow,
     // enableFlow:  flows.enableFlow,
 
-
     // Credentials
     addCredentials: credentials.add,
     getCredentials: credentials.get,