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

refactor templater: Use resource set 'path' field when loading files

Browse source
This commit is contained in:
Vincent Ambo 2017-07-13 16:00:21 +02:00
parent 7607f6dc0f
commit 5e7bb55e00
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
templater/templater.go
View file

@ -22,6 +22,7 @@ const failOnMissingKeys string = "missingkey=error"
type TemplateNotFoundError struct { type TemplateNotFoundError struct {
meep.AllTraits meep.AllTraits
Name string Name string
Path string
} }
// Error that is caused during templating, e.g. required value being absent or invalid template format // Error that is caused during templating, e.g. required value being absent or invalid template format
@ -64,14 +65,14 @@ func LoadAndApplyTemplates(include *[]string, exclude *[]string, c *context.Cont
func processResourceSet(c *context.Context, rs *context.ResourceSet) (*RenderedResourceSet, error) { func processResourceSet(c *context.Context, rs *context.ResourceSet) (*RenderedResourceSet, error) {
fmt.Fprintf(os.Stderr, "Loading resources for %s\n", rs.Name) fmt.Fprintf(os.Stderr, "Loading resources for %s\n", rs.Name)
rp := path.Join(c.BaseDir, rs.Name) rp := path.Join(c.BaseDir, rs.Path)
files, err := ioutil.ReadDir(rp) files, err := ioutil.ReadDir(rp)
resources, err := processFiles(c, rs, rp, files) resources, err := processFiles(c, rs, rp, files)
if err != nil { if err != nil {
return nil, meep.New( return nil, meep.New(
&TemplateNotFoundError{Name: rs.Name}, &TemplateNotFoundError{Name: rs.Name, Path: rs.Path},
meep.Cause(err), meep.Cause(err),
) )
} }