public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LDAP: Interpolate env variable expressions in ldap.toml file (#20173)

Browse Source 
* LDAP: Interpolate env variable expressions in ldap.toml file

* Removed comment
This commit is contained in:
Torkel Ödegaard
2019-11-06 21:41:21 +01:00
committed by GitHub
parent 51a0e5fdf9
commit 4ffff1a312
4 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/setting/setting.go
+2 -2
View File
@@ -412,7 +412,7 @@ func makeAbsolute(path string, root string) string {
return filepath.Join(root, path)
}
func evalEnvVarExpression(value string) string {
func EvalEnvVarExpression(value string) string {
regex := regexp.MustCompile(`\${(\w+)}`)
return regex.ReplaceAllStringFunc(value, func(envVar string) string {
envVar = strings.TrimPrefix(envVar, "${")
@@ -431,7 +431,7 @@ func evalEnvVarExpression(value string) string {
func evalConfigValues(file *ini.File) {
for _, section := range file.Sections() {
for _, key := range section.Keys() {
key.SetValue(evalEnvVarExpression(key.Value()))
key.SetValue(EvalEnvVarExpression(key.Value()))
}
}
}