public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix possible race while templating (#38) 

Fixes #32
Fixes #37
This commit is contained in:
KUOKA Yusuke 2018-03-01 22:54:31 +09:00 committed by GitHub
parent bb67abffb4
commit f02790d566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
state/state.go
View File

@ -68,7 +68,9 @@ var stringTemplateFuncMap = template.FuncMap{
"env": getEnvVar, "env": getEnvVar,
} }
var stringTemplate = template.New("stringTemplate").Funcs(stringTemplateFuncMap) func stringTemplate() *template.Template {
return template.New("stringTemplate").Funcs(stringTemplateFuncMap)
}
func getEnvVar(envVarName string) (string, error) { func getEnvVar(envVarName string) (string, error) {
envVarValue, isSet := os.LookupEnv(envVarName) envVarValue, isSet := os.LookupEnv(envVarName)
@ -82,7 +84,7 @@ func getEnvVar(envVarName string) (string, error) {
} }
func renderTemplateString(s string) (string, error) { func renderTemplateString(s string) (string, error) {
var t, parseErr = stringTemplate.Parse(s) var t, parseErr = stringTemplate().Parse(s)
if parseErr != nil { if parseErr != nil {
return "", parseErr return "", parseErr
} }