about summary refs log tree commit diff
path: root/main.go
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2018-06-09T14·23+0200
committerVincent Ambo <github@tazj.in>2018-06-09T17·16+0200
commitb33c353233aae4d73b1567aee41fd5d4cad5bf76 (patch)
tree026eeb9ef627960180d07f84e75639b727f90c70 /main.go
parent5cf9d53e80accaeede1b4e38772d7d53c0190549 (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 'main.go')
-rw-r--r--main.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/main.go b/main.go
index ee70bdae55a8..b792a1a3b517 100644
--- a/main.go
+++ b/main.go
@@ -184,16 +184,11 @@ func createCommand() {
 }
 
 func loadContextAndResources(file *string) (*context.Context, *[]templater.RenderedResourceSet) {
-	ctx, err := context.LoadContextFromFile(*file)
+	ctx, err := context.LoadContext(*file, variables)
 	if err != nil {
 		app.Fatalf("Error loading context: %v\n", err)
 	}
 
-	err = ctx.SetVariablesFromArguments(variables)
-	if err != nil {
-		app.Fatalf("Error setting explicit variables in context: %v\n", err)
-	}
-
 	resources, err := templater.LoadAndApplyTemplates(includes, excludes, ctx)
 	if err != nil {
 		app.Fatalf("Error templating resource sets: %v\n", err)