From 8bc7dede1864b94ced115a566c115e522b4af11b Mon Sep 17 00:00:00 2001 From: Lukas Eichler Date: Sun, 3 Dec 2017 17:39:34 +0100 Subject: [PATCH] fix(helm): Apply PR comments for tpl template name fix Modified existing unit test to verify the changed behavior. Removed debug print. --- pkg/engine/engine.go | 2 -- pkg/engine/engine_test.go | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index dfbc257ce..46e0a59cf 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -177,8 +177,6 @@ func (e *Engine) alterFuncMap(t *template.Template) template.FuncMap { basePath: basePath.(string), } - println(vals.Table) - templates := map[string]renderable{} templateName, err := vals.PathValue("Template.Name") if err != nil { diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 7da4a9103..8ffb3d87c 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -538,7 +538,7 @@ func TestAlterFuncMap(t *testing.T) { Metadata: &chart.Metadata{Name: "TplFunction"}, Templates: []*chart.Template{ {Name: "templates/base", Data: []byte(`{{ tpl "{{include ` + "`" + `TplFunction/templates/_partial` + "`" + ` . | quote }}" .}}`)}, - {Name: "templates/_partial", Data: []byte(`{{.Release.Name}}`)}, + {Name: "templates/_partial", Data: []byte(`{{.Template.Name}}`)}, }, Values: &chart.Config{Raw: ``}, Dependencies: []*chart.Chart{}, @@ -558,7 +558,7 @@ func TestAlterFuncMap(t *testing.T) { t.Fatal(err) } - expectedTplStrWithInclude := "\"TestRelease\"" + expectedTplStrWithInclude := "\"TplFunction/templates/base\"" if gotStrTplWithInclude := outTplWithInclude["TplFunction/templates/base"]; gotStrTplWithInclude != expectedTplStrWithInclude { t.Errorf("Expected %q, got %q (%v)", expectedTplStrWithInclude, gotStrTplWithInclude, outTplWithInclude) }