mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(context): Global values have precedence over defaults

Browse source
This commit is contained in:
Vincent Ambo 2018-06-09 20:45:42 +02:00 committed by Vincent Ambo
parent ae6d960df9
commit 77ca5b47cf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
context/context.go
View file

@ -88,7 +88,7 @@ func LoadContext(filename string, explicitVars *[]string) (*Context, error) {
return nil, contextLoadingError(filename, err) return nil, contextLoadingError(filename, err)
} }
// Merge variables (explicit > import > include > global > default) // Merge variables (explicit > import > include > global > default)
ctx.ResourceSets = ctx.mergeContextValues() ctx.ResourceSets = ctx.mergeContextValues()
if err != nil { if err != nil {
@ -168,7 +168,7 @@ func (ctx *Context) mergeContextValues() []ResourceSet {
for i, rs := range ctx.ResourceSets { for i, rs := range ctx.ResourceSets {
merged := loadDefaultValues(&rs, ctx) merged := loadDefaultValues(&rs, ctx)
merged = util.Merge(&ctx.Global, merged) merged = util.Merge(merged, &ctx.Global)
merged = util.Merge(merged, &ctx.ImportedVars) merged = util.Merge(merged, &ctx.ImportedVars)
merged = util.Merge(merged, &ctx.ExplicitVars) merged = util.Merge(merged, &ctx.ExplicitVars)
rs.Values = *merged rs.Values = *merged