maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(context): Ensure resource set paths are made absolute

Browse source 
Resolving of files (for `insertFile` and `insertTemplate`) should
always be relative to the resource set location, the previous
behaviour was considered a bug.

This is fixed by ensuring that resource set paths are absolute at
context loading time.
This commit is contained in:
Vincent Ambo 2019-09-04 10:56:07 +01:00 • committed by Vincent Ambo
parent 75a3cd2534
commit d0f52766b3
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
context/context.go
View file

@ -77,7 +77,7 @@ func LoadContext(filename string, explicitVars *[]string) (*Context, error) {
ctx.BaseDir = path.Dir(filename)
// Prepare the resource sets by resolving parents etc.
ctx.ResourceSets = flattenPrepareResourceSetPaths(&ctx.ResourceSets)
ctx.ResourceSets = flattenPrepareResourceSetPaths(&ctx.BaseDir, &ctx.ResourceSets)
// Add variables explicitly specified on the command line
ctx.ExplicitVars, err = loadExplicitVars(explicitVars)
@ -136,7 +136,7 @@ func (ctx *Context) loadImportedVariables() (map[string]interface{}, error) {
// collections, i.e. resource sets that themselves have an additional 'include' field set.
// Those will be regarded as a short-hand for including multiple resource sets from a subfolder.
// See https://github.com/tazjin/kontemplate/issues/9 for more information.
func flattenPrepareResourceSetPaths(rs *[]ResourceSet) []ResourceSet {
func flattenPrepareResourceSetPaths(baseDir *string, rs *[]ResourceSet) []ResourceSet {
flattened := make([]ResourceSet, 0)
for _, r := range *rs {
@ -146,6 +146,12 @@ func flattenPrepareResourceSetPaths(rs *[]ResourceSet) []ResourceSet {
r.Path = r.Name
}
// Paths are made absolute by resolving them relative to the context base,
// unless absolute paths were specified.
if !path.IsAbs(r.Path) {
r.Path = path.Join(*baseDir, r.Path)
}
if len(r.Include) == 0 {
flattened = append(flattened, r)
} else {
@ -225,7 +231,7 @@ func loadDefaultValues(rs *ResourceSet, c *Context) *map[string]interface{} {
var defaultVars map[string]interface{}
for _, filename := range util.DefaultFilenames {
err := util.LoadData(path.Join(c.BaseDir, rs.Path, filename), &defaultVars)
err := util.LoadData(path.Join(rs.Path, filename), &defaultVars)
if err == nil {
return &defaultVars
}