maurice/snix
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
Download patch file Download diff file Expand all files Collapse all files

3
util/util.go
View file

@ -9,6 +9,9 @@ import (
"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.
// The returned map is new if anything was changed.
func Merge(in1 *map[string]interface{}, in2 *map[string]interface{}) *map[string]interface{} {