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

9
templater/templater.go
View file

@ -62,8 +62,7 @@ func LoadAndApplyTemplates(include *[]string, exclude *[]string, c *context.Cont
func processResourceSet(ctx *context.Context, rs *context.ResourceSet) (*RenderedResourceSet, error) {
fmt.Fprintf(os.Stderr, "Loading resources for %s\n", rs.Name)
resourcePath := path.Join(ctx.BaseDir, rs.Path)
fileInfo, err := os.Stat(resourcePath)
fileInfo, err := os.Stat(rs.Path)
if err != nil {
return nil, err
}
@ -78,13 +77,13 @@ func processResourceSet(ctx *context.Context, rs *context.ResourceSet) (*Rendere
// list of files instead.
// This will end up printing a warning to the user, but it
// won't stop the rest of the process.
files, _ = ioutil.ReadDir(resourcePath)
files, _ = ioutil.ReadDir(rs.Path)
resources, err = processFiles(ctx, rs, files)
if err != nil {
return nil, err
}
} else {
resource, err := templateFile(ctx, rs, resourcePath)
resource, err := templateFile(ctx, rs, rs.Path)
if err != nil {
return nil, err
}
@ -104,7 +103,7 @@ func processFiles(ctx *context.Context, rs *context.ResourceSet, files []os.File
for _, file := range files {
if !file.IsDir() && isResourceFile(file) {
path := path.Join(ctx.BaseDir, rs.Path, file.Name())
path := path.Join(rs.Path, file.Name())
res, err := templateFile(ctx, rs, path)
if err != nil {