frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix env evaluation when one env references another in the same object

Browse Source 
Fixes #4342
This commit is contained in:
Nick O'Leary 2023-09-22 13:49:54 +01:00
parent d9bbac20f3
commit 797cea5394
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/node_modules/@node-red/runtime/lib/flows/util.js vendored
View File

@ -112,6 +112,7 @@ async function evaluateEnvProperties(flow, env, credentials) {
if (pendingEvaluations.length > 0) { if (pendingEvaluations.length > 0) {
await Promise.all(pendingEvaluations) await Promise.all(pendingEvaluations)
} }
// Now loop over the env types and evaluate them properly
for (let i = 0; i < envTypes.length; i++) { for (let i = 0; i < envTypes.length; i++) {
let { name, value, type } = envTypes[i] let { name, value, type } = envTypes[i]
// If an env-var wants to lookup itself, delegate straight to the parent // If an env-var wants to lookup itself, delegate straight to the parent
@ -122,7 +123,17 @@ async function evaluateEnvProperties(flow, env, credentials) {
if (evaluatedEnv.hasOwnProperty(value)) { if (evaluatedEnv.hasOwnProperty(value)) {
value = evaluatedEnv[value] value = evaluatedEnv[value]
} else { } else {
value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null); value = redUtil.evaluateNodeProperty(value, type, {_flow: {
// Provide a hook so when it tries to look up a flow setting,
// we can insert the just-evaluated value which hasn't yet
// been set on the flow object - otherwise delegate up to the flow
getSetting: function(name) {
if (evaluatedEnv.hasOwnProperty(name)){
return evaluatedEnv[name]
}
return flow.getSetting(name)
}
}}, null, null);
} }
evaluatedEnv[name] = value evaluatedEnv[name] = value
} }