Skip to content

Commit

Permalink
Merge b26a9fe into 31252a2
Browse files Browse the repository at this point in the history
  • Loading branch information
evityuk committed Feb 14, 2019
2 parents 31252a2 + b26a9fe commit 1a82bbb
Show file tree
Hide file tree
Showing 21 changed files with 2,109 additions and 2 deletions.
14 changes: 12 additions & 2 deletions api_definition.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (
"text/template"
"time"

"gopkg.in/Masterminds/sprig.v2"

"github.com/TykTechnologies/tyk/rpc"

"github.com/Sirupsen/logrus"
Expand Down Expand Up @@ -511,9 +513,17 @@ var apiTemplate = template.New("").Funcs(map[string]interface{}{
},
})

func (a APIDefinitionLoader) filterSprigFuncs() template.FuncMap {
tmp := sprig.GenericFuncMap()
delete(tmp, "env")
delete(tmp, "expandenv")

return template.FuncMap(tmp)
}

func (a APIDefinitionLoader) loadFileTemplate(path string) (*template.Template, error) {
log.Debug("-- Loading template: ", path)
return apiTemplate.New("").ParseFiles(path)
return apiTemplate.New("").Funcs(a.filterSprigFuncs()).ParseFiles(path)
}

func (a APIDefinitionLoader) loadBlobTemplate(blob string) (*template.Template, error) {
Expand All @@ -522,7 +532,7 @@ func (a APIDefinitionLoader) loadBlobTemplate(blob string) (*template.Template,
if err != nil {
return nil, err
}
return apiTemplate.New("").Parse(string(uDec))
return apiTemplate.New("").Funcs(a.filterSprigFuncs()).Parse(string(uDec))
}

func (a APIDefinitionLoader) compileTransformPathSpec(paths []apidef.TemplateMeta, stat URLStatus) []URLSpec {
Expand Down
153 changes: 153 additions & 0 deletions vendor/gopkg.in/Masterminds/sprig.v2/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions vendor/gopkg.in/Masterminds/sprig.v2/LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions vendor/gopkg.in/Masterminds/sprig.v2/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 81 additions & 0 deletions vendor/gopkg.in/Masterminds/sprig.v2/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions vendor/gopkg.in/Masterminds/sprig.v2/appveyor.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1a82bbb

Please sign in to comment.