msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #935 from technosophos/fix/933-template-names

Browse Source 
fix(engine): change template naming
pull/939/head
Matt Butcher 9 years ago committed by GitHub
parent f2a7b79eb3 73a2890277
commit cd230ab10e
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File

12
cmd/tiller/release_server_test.go
Unescape View File

@ -134,7 +134,7 @@ func TestInstallRelease(t *testing.T) {
t.Errorf("Expected manifest in %v", res) t.Errorf("Expected manifest in %v", res)
} }
if !strings.Contains(rel.Manifest, "---\n# Source: hello\nhello: world") { if !strings.Contains(rel.Manifest, "---\n# Source: hello/hello\nhello: world") {
t.Errorf("unexpected output: %s", rel.Manifest) t.Errorf("unexpected output: %s", rel.Manifest)
} }
} }
@ -150,8 +150,8 @@ func TestInstallReleaseDryRun(t *testing.T) {
{Name: "hello", Data: []byte("hello: world")}, {Name: "hello", Data: []byte("hello: world")},
{Name: "goodbye", Data: []byte("goodbye: world")}, {Name: "goodbye", Data: []byte("goodbye: world")},
{Name: "empty", Data: []byte("")}, {Name: "empty", Data: []byte("")},
{Name: "with-partials", Data: []byte("hello: {{ template \"partials/_planet\" . }}")}, {Name: "with-partials", Data: []byte(`hello: {{ template "_planet" . }}`)},
{Name: "partials/_planet", Data: []byte("Earth")}, {Name: "partials/_planet", Data: []byte(`{{define "_planet"}}Earth{{end}}`)},
{Name: "hooks", Data: []byte(manifestWithHook)}, {Name: "hooks", Data: []byte(manifestWithHook)},
}, },
}, },
@ -165,11 +165,11 @@ func TestInstallReleaseDryRun(t *testing.T) {
t.Errorf("Expected release name.") t.Errorf("Expected release name.")
} }
if !strings.Contains(res.Release.Manifest, "---\n# Source: hello\nhello: world") { if !strings.Contains(res.Release.Manifest, "---\n# Source: hello/hello\nhello: world") {
t.Errorf("unexpected output: %s", res.Release.Manifest) t.Errorf("unexpected output: %s", res.Release.Manifest)
} }
if !strings.Contains(res.Release.Manifest, "---\n# Source: goodbye\ngoodbye: world") { if !strings.Contains(res.Release.Manifest, "---\n# Source: hello/goodbye\ngoodbye: world") {
t.Errorf("unexpected output: %s", res.Release.Manifest) t.Errorf("unexpected output: %s", res.Release.Manifest)
} }
@ -177,7 +177,7 @@ func TestInstallReleaseDryRun(t *testing.T) {
t.Errorf("Should contain partial content. %s", res.Release.Manifest) t.Errorf("Should contain partial content. %s", res.Release.Manifest)
} }
if strings.Contains(res.Release.Manifest, "hello: {{ template \"partials/_planet\" . }}") { if strings.Contains(res.Release.Manifest, "hello: {{ template \"_planet\" . }}") {
t.Errorf("Should not contain partial templates itself. %s", res.Release.Manifest) t.Errorf("Should not contain partial templates itself. %s", res.Release.Manifest)
} }

19
pkg/engine/engine.go
Unescape View File

@ -19,6 +19,8 @@ package engine
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"log"
"path"
"strings" "strings"
"text/template" "text/template"
@ -105,6 +107,7 @@ func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
} }
files := []string{} files := []string{}
for fname, r := range tpls { for fname, r := range tpls {
log.Printf("Preparing template %s", fname)
t = t.New(fname).Funcs(e.FuncMap) t = t.New(fname).Funcs(e.FuncMap)
if _, err := t.Parse(r.tpl); err != nil { if _, err := t.Parse(r.tpl); err != nil {
return map[string]string{}, fmt.Errorf("parse error in %q: %s", fname, err) return map[string]string{}, fmt.Errorf("parse error in %q: %s", fname, err)
@ -137,7 +140,7 @@ func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
// As it goes, it also prepares the values in a scope-sensitive manner. // As it goes, it also prepares the values in a scope-sensitive manner.
func allTemplates(c *chart.Chart, vals chartutil.Values) map[string]renderable { func allTemplates(c *chart.Chart, vals chartutil.Values) map[string]renderable {
templates := map[string]renderable{} templates := map[string]renderable{}
recAllTpls(c, templates, vals, true) recAllTpls(c, templates, vals, true, "")
return templates return templates
} }
@ -145,7 +148,7 @@ func allTemplates(c *chart.Chart, vals chartutil.Values) map[string]renderable {
// //
// As it recurses, it also sets the values to be appropriate for the template // As it recurses, it also sets the values to be appropriate for the template
// scope. // scope.
func recAllTpls(c *chart.Chart, templates map[string]renderable, parentVals chartutil.Values, top bool) { func recAllTpls(c *chart.Chart, templates map[string]renderable, parentVals chartutil.Values, top bool, parentID string) {
// This should never evaluate to a nil map. That will cause problems when // This should never evaluate to a nil map. That will cause problems when
// values are appended later. // values are appended later.
cvals := chartutil.Values{} cvals := chartutil.Values{}
@ -170,11 +173,19 @@ func recAllTpls(c *chart.Chart, templates map[string]renderable, parentVals char
} }
} }
newParentID := c.Metadata.Name
if parentID != "" {
// We artificially reconstruct the chart path to child templates. This
// creates a namespaced filename that can be used to track down the source
// of a particular template declaration.
newParentID = path.Join(parentID, "charts", newParentID)
}
for _, child := range c.Dependencies { for _, child := range c.Dependencies {
recAllTpls(child, templates, cvals, false) recAllTpls(child, templates, cvals, false, newParentID)
} }
for _, t := range c.Templates { for _, t := range c.Templates {
templates[t.Name] = renderable{ templates[path.Join(newParentID, t.Name)] = renderable{
tpl: string(t.Data), tpl: string(t.Data),
vals: cvals, vals: cvals,
} }

29
pkg/engine/engine_test.go
Unescape View File

@ -75,16 +75,16 @@ func TestRender(t *testing.T) {
} }
expect := "Spouter Inn" expect := "Spouter Inn"
if out["test1"] != expect { if out["moby/test1"] != expect {
t.Errorf("Expected %q, got %q", expect, out["test1"]) t.Errorf("Expected %q, got %q", expect, out["test1"])
} }
expect = "ishmael" expect = "ishmael"
if out["test2"] != expect { if out["moby/test2"] != expect {
t.Errorf("Expected %q, got %q", expect, out["test2"]) t.Errorf("Expected %q, got %q", expect, out["test2"])
} }
expect = "" expect = ""
if out["test3"] != expect { if out["moby/test3"] != expect {
t.Errorf("Expected %q, got %q", expect, out["test3"]) t.Errorf("Expected %q, got %q", expect, out["test3"])
} }
@ -188,11 +188,13 @@ func TestRenderDependency(t *testing.T) {
deptpl := `{{define "myblock"}}World{{end}}` deptpl := `{{define "myblock"}}World{{end}}`
toptpl := `Hello {{template "myblock"}}` toptpl := `Hello {{template "myblock"}}`
ch := &chart.Chart{ ch := &chart.Chart{
Metadata: &chart.Metadata{Name: "outerchart"},
Templates: []*chart.Template{ Templates: []*chart.Template{
{Name: "outer", Data: []byte(toptpl)}, {Name: "outer", Data: []byte(toptpl)},
}, },
Dependencies: []*chart.Chart{ Dependencies: []*chart.Chart{
{ {
Metadata: &chart.Metadata{Name: "innerchart"},
Templates: []*chart.Template{ Templates: []*chart.Template{
{Name: "inner", Data: []byte(deptpl)}, {Name: "inner", Data: []byte(deptpl)},
}, },
@ -211,7 +213,7 @@ func TestRenderDependency(t *testing.T) {
} }
expect := "Hello World" expect := "Hello World"
if out["outer"] != expect { if out["outerchart/outer"] != expect {
t.Errorf("Expected %q, got %q", expect, out["outer"]) t.Errorf("Expected %q, got %q", expect, out["outer"])
} }
@ -220,10 +222,11 @@ func TestRenderDependency(t *testing.T) {
func TestRenderNestedValues(t *testing.T) { func TestRenderNestedValues(t *testing.T) {
e := New() e := New()
innerpath := "charts/inner/templates/inner.tpl" innerpath := "templates/inner.tpl"
outerpath := "templates/outer.tpl" outerpath := "templates/outer.tpl"
deepestpath := "charts/inner/charts/deepest/templates/deepest.tpl" // Ensure namespacing rules are working.
checkrelease := "charts/inner/charts/deepest/templates/release.tpl" deepestpath := "templates/inner.tpl"
checkrelease := "templates/release.tpl"
deepest := &chart.Chart{ deepest := &chart.Chart{
Metadata: &chart.Metadata{Name: "deepest"}, Metadata: &chart.Metadata{Name: "deepest"},
@ -288,19 +291,19 @@ global:
t.Fatalf("failed to render templates: %s", err) t.Fatalf("failed to render templates: %s", err)
} }
if out[outerpath] != "Gather ye rosebuds while ye may" { if out["top/"+outerpath] != "Gather ye rosebuds while ye may" {
t.Errorf("Unexpected outer: %q", out[outerpath]) t.Errorf("Unexpected outer: %q", out[outerpath])
} }
if out[innerpath] != "Old time is still a-flyin'" { if out["top/charts/herrick/"+innerpath] != "Old time is still a-flyin'" {
t.Errorf("Unexpected inner: %q", out[innerpath]) t.Errorf("Unexpected inner: %q", out[innerpath])
} }
if out[deepestpath] != "And this same flower that smiles to-day" { if out["top/charts/herrick/charts/deepest/"+deepestpath] != "And this same flower that smiles to-day" {
t.Errorf("Unexpected deepest: %q", out[deepestpath]) t.Errorf("Unexpected deepest: %q", out[deepestpath])
} }
if out[checkrelease] != "Tomorrow will be dyin" { if out["top/charts/herrick/charts/deepest/"+checkrelease] != "Tomorrow will be dyin" {
t.Errorf("Unexpected release: %q", out[checkrelease]) t.Errorf("Unexpected release: %q", out[checkrelease])
} }
} }
@ -340,8 +343,8 @@ func TestRenderBuiltinValues(t *testing.T) {
} }
expects := map[string]string{ expects := map[string]string{
"Lavinia": "LaviniaLatiumAeneid", "Troy/charts/Latium/Lavinia": "Troy/charts/Latium/LaviniaLatiumAeneid",
"Aeneas": "AeneasTroyAeneid", "Troy/Aeneas": "Troy/AeneasTroyAeneid",
} }
for file, expect := range expects { for file, expect := range expects {
if out[file] != expect { if out[file] != expect {

Write Preview
Loading…
Cancel
Save