diff options
author | Vincent Ambo <tazjin@gmail.com> | 2017-08-31T16·37+0200 |
---|---|---|
committer | Vincent Ambo <tazjin@gmail.com> | 2017-08-31T16·41+0200 |
commit | b20bc5f57a9e4e25760f03de752c2ed2811fa5fe (patch) | |
tree | c61a99691557b08977e1a79db59556c2a83be8b2 /context | |
parent | 063a3e9d3037c77aea765d7c58bff567b21d5946 (diff) |
fix templater: Don't template default.yml files
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
Diffstat (limited to 'context')
-rw-r--r-- | context/context.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/context/context.go b/context/context.go index fe04a051efed..0be42d6d222b 100644 --- a/context/context.go +++ b/context/context.go @@ -143,9 +143,7 @@ func loadAllDefaultValues(c *Context) []ResourceSet { func loadDefaultValues(rs *ResourceSet, c *Context) *map[string]interface{} { var defaultVars map[string]interface{} - defaultFilenames := []string{"default.yml", "default.yaml", "default.json"} - - for _, filename := range defaultFilenames { + for _, filename := range util.DefaultFilenames { err := util.LoadJsonOrYaml(path.Join(c.BaseDir, rs.Path, filename), &defaultVars) if err == nil { return util.Merge(&defaultVars, &rs.Values) |