From c815e0d288b589ca484a3d789101ab560d47e764 Mon Sep 17 00:00:00 2001 From: Benjamin Ash Date: Wed, 16 Sep 2020 12:32:22 -0400 Subject: [PATCH] engine: make template function map public Signed-off-by: Benjamin Ash --- pkg/engine/engine.go | 2 +- pkg/engine/engine_test.go | 2 +- pkg/engine/funcs.go | 4 ++-- pkg/engine/funcs_test.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 155d50a38..7be5113ce 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -105,7 +105,7 @@ func warnWrap(warn string) string { // initFunMap creates the Engine's FuncMap and adds context-specific functions. func (e Engine) initFunMap(t *template.Template, referenceTpls map[string]renderable) { - funcMap := funcMap() + funcMap := FuncMap() includedNames := make(map[string]int) // Add the 'include' function here so we can close over t. diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 87e84c48b..3c95b77c7 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -61,7 +61,7 @@ func TestSortTemplates(t *testing.T) { } func TestFuncMap(t *testing.T) { - fns := funcMap() + fns := FuncMap() forbidden := []string{"env", "expandenv"} for _, f := range forbidden { if _, ok := fns[f]; ok { diff --git a/pkg/engine/funcs.go b/pkg/engine/funcs.go index 92b4c3383..8db45f353 100644 --- a/pkg/engine/funcs.go +++ b/pkg/engine/funcs.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/yaml" ) -// funcMap returns a mapping of all of the functions that Engine has. +// FuncMap returns a mapping of all of the functions that Engine has. // // Because some functions are late-bound (e.g. contain context-sensitive // data), the functions may not all perform identically outside of an Engine @@ -41,7 +41,7 @@ import ( // These are late-bound in Engine.Render(). The // version included in the FuncMap is a placeholder. // -func funcMap() template.FuncMap { +func FuncMap() template.FuncMap { f := sprig.TxtFuncMap() delete(f, "env") delete(f, "expandenv") diff --git a/pkg/engine/funcs_test.go b/pkg/engine/funcs_test.go index 62c63ec2b..06c62fd1e 100644 --- a/pkg/engine/funcs_test.go +++ b/pkg/engine/funcs_test.go @@ -103,7 +103,7 @@ func TestFuncs(t *testing.T) { for _, tt := range tests { var b strings.Builder - err := template.Must(template.New("test").Funcs(funcMap()).Parse(tt.tpl)).Execute(&b, tt.vars) + err := template.Must(template.New("test").Funcs(FuncMap()).Parse(tt.tpl)).Execute(&b, tt.vars) assert.NoError(t, err) assert.Equal(t, tt.expect, b.String(), tt.tpl) } @@ -155,7 +155,7 @@ func TestMerge(t *testing.T) { } tpl := `{{merge .dst .src1 .src2}}` var b strings.Builder - err := template.Must(template.New("test").Funcs(funcMap()).Parse(tpl)).Execute(&b, dict) + err := template.Must(template.New("test").Funcs(FuncMap()).Parse(tpl)).Execute(&b, dict) assert.NoError(t, err) expected := map[string]interface{}{