mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix templater: Don't template default.yml files

Browse source 
After the change from #84 default variable files with the '.yml'
extension got templated as resource set templates accidentally.

This resolves the issue by moving the list reserved default file names
to a common place and reusing it in both the templater and context pkg.

This fixes #85
This commit is contained in:
Vincent Ambo 2017-08-31 18:37:57 +02:00
parent 063a3e9d30
commit b20bc5f57a
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
context/context.go
View file

@ -143,9 +143,7 @@ func loadAllDefaultValues(c *Context) []ResourceSet {
func loadDefaultValues(rs *ResourceSet, c *Context) *map[string]interface{} { func loadDefaultValues(rs *ResourceSet, c *Context) *map[string]interface{} {
var defaultVars map[string]interface{} var defaultVars map[string]interface{}
defaultFilenames := []string{"default.yml", "default.yaml", "default.json"} for _, filename := range util.DefaultFilenames {
for _, filename := range defaultFilenames {
err := util.LoadJsonOrYaml(path.Join(c.BaseDir, rs.Path, filename), &defaultVars) err := util.LoadJsonOrYaml(path.Join(c.BaseDir, rs.Path, filename), &defaultVars)
if err == nil { if err == nil {
return util.Merge(&defaultVars, &rs.Values) return util.Merge(&defaultVars, &rs.Values)

4
templater/templater.go
View file

@ -186,9 +186,11 @@ func templateFuncs() template.FuncMap {
// Checks whether a file is a resource file (i.e. is YAML or JSON) and not a default values file. // Checks whether a file is a resource file (i.e. is YAML or JSON) and not a default values file.
func isResourceFile(f os.FileInfo) bool { func isResourceFile(f os.FileInfo) bool {
if f.Name() == "default.json" || f.Name() == "default.yaml" { for _, defaultFile := range util.DefaultFilenames {
if f.Name() == defaultFile {
return false return false
} }
}
return strings.HasSuffix(f.Name(), "yaml") || return strings.HasSuffix(f.Name(), "yaml") ||
strings.HasSuffix(f.Name(), "yml") || strings.HasSuffix(f.Name(), "yml") ||

3
util/util.go
View file

@ -9,6 +9,9 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )
// Filenames excluded from templating for the purpose of containing default variable values inside a resource set.
var DefaultFilenames []string = []string{"default.yml", "default.yaml", "default.json"}
// Merges two maps together. Values from the second map override values in the first map. // Merges two maps together. Values from the second map override values in the first map.
// The returned map is new if anything was changed. // The returned map is new if anything was changed.
func Merge(in1 *map[string]interface{}, in2 *map[string]interface{}) *map[string]interface{} { func Merge(in1 *map[string]interface{}, in2 *map[string]interface{}) *map[string]interface{} {