From b33c353233aae4d73b1567aee41fd5d4cad5bf76 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Sat, 9 Jun 2018 16:23:09 +0200
Subject: 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`.
---
 templater/templater.go | 2 --
 1 file changed, 2 deletions(-)

(limited to 'templater/templater.go')

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 {
-- 
cgit 1.4.1