diff options
| author | Vincent Ambo <tazjin@gmail.com> | 2018-06-09T14·23+0200 |
|---|---|---|
| committer | Vincent Ambo <github@tazj.in> | 2018-06-09T17·16+0200 |
| commit | b33c353233aae4d73b1567aee41fd5d4cad5bf76 (patch) | |
| tree | 026eeb9ef627960180d07f84e75639b727f90c70 /templater | |
| parent | 5cf9d53e80accaeede1b4e38772d7d53c0190549 (diff) | |
refactor(context): Implement more explicit merging of variables
The hierarchy for loading variables was previously not expressed explicitly. This commit refactors the logic for merging variables to explicitly set the different layers of variables as values on the context object and merge them for each resource set in `mergeContextValues`.
Diffstat (limited to 'templater')
| -rw-r--r-- | templater/templater.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/templater/templater.go b/templater/templater.go index c0eff234f5b7..13ec9643eddd 100644 --- a/templater/templater.go +++ b/templater/templater.go @@ -111,8 +111,6 @@ func templateFile(c *context.Context, rs *context.ResourceSet, filename string) var b bytes.Buffer - rs.Values = *util.Merge(&c.Global, &rs.Values) - err = tpl.Execute(&b, rs.Values) if err != nil { |