From b20bc5f57a9e4e25760f03de752c2ed2811fa5fe Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 31 Aug 2017 18:37:57 +0200 Subject: 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 --- util/util.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'util/util.go') diff --git a/util/util.go b/util/util.go index 0c5815a38b..eb8806036b 100644 --- a/util/util.go +++ b/util/util.go @@ -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{} { -- cgit 1.4.1