Merge pull request #1038 from OpenNMS/jira/OPG-488-perf-query-variabl…

…e-interpolation-issue OPG-488: Fix issue with Performance query variable interpolation
OpenNMS · Dec 12, 2024 · a6294dd · a6294dd
2 parents 233c30d + 0e3ae0b
commit a6294dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/datasources/perf-ds/queries/interpolate.ts b/src/datasources/perf-ds/queries/interpolate.ts
@@ -146,10 +146,14 @@ const replaceQueryValueWithVariables = (queryValue: any, variables: Interpolatio
         }
 
         // check for '$variableName' syntax
-        const regexVarName = '\\$' + variable.name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+        // we add word boundary at the end so we don't have spurious partial matches on variables
+        // having same beginning portion of name
+        let regexVarName = '\\$' + variable.name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+        regexVarName = regexVarName + '\\b'
+
         interpolatedValue = interpolatedValue.replace(new RegExp(regexVarName, 'g'), variableValue)
 
-        // check for ${var} with optional {$var:format} where 'format' must be alphanumeric
+        // check for ${var} with optional ${var:format} where 'format' must be alphanumeric
         const regexWithBracesAndFormat = getVariableWithBracesReferencePattern(variable.name)
         interpolatedValue = interpolatedValue.replace(new RegExp(regexWithBracesAndFormat, 'g'), variableValue)
     })