Skip to content
Permalink
Browse files

Merge pull request #5423 from joelanford/savedir-mkdir-templates

pkg/chartutil: fix SaveDir for nested templates directories
  • Loading branch information...
bacongobbler committed Mar 12, 2019
2 parents 87b44dd + a9c10fe commit 744cd20eab4e0525bccbea957da2047d6b469e61
Showing with 21 additions and 0 deletions.
  1. +6 −0 pkg/chartutil/save.go
  2. +15 −0 pkg/chartutil/save_test.go
@@ -63,6 +63,12 @@ func SaveDir(c *chart.Chart, dest string) error {
// Save templates
for _, f := range c.Templates {
n := filepath.Join(outdir, f.Name)

d := filepath.Dir(n)
if err := os.MkdirAll(d, 0755); err != nil {
return err
}

if err := ioutil.WriteFile(n, f.Data, 0644); err != nil {
return err
}
@@ -48,6 +48,9 @@ func TestSave(t *testing.T) {
Files: []*any.Any{
{TypeUrl: "scheherazade/shahryar.txt", Value: []byte("1,001 Nights")},
},
Templates: []*chart.Template{
{Name: "templates/scheherazade/shahryar.txt.tmpl", Data: []byte("{{ \"1,001 Nights\" }}")},
},
}

where, err := Save(c, tmp)
@@ -75,6 +78,9 @@ func TestSave(t *testing.T) {
if len(c2.Files) != 1 || c2.Files[0].TypeUrl != "scheherazade/shahryar.txt" {
t.Fatal("Files data did not match")
}
if len(c2.Templates) != 1 || c2.Templates[0].Name != "templates/scheherazade/shahryar.txt.tmpl" {
t.Fatal("Templates data did not match")
}
}

func TestSavePreservesTimestamps(t *testing.T) {
@@ -100,6 +106,9 @@ func TestSavePreservesTimestamps(t *testing.T) {
Files: []*any.Any{
{TypeUrl: "scheherazade/shahryar.txt", Value: []byte("1,001 Nights")},
},
Templates: []*chart.Template{
{Name: "templates/scheherazade/shahryar.txt.tmpl", Data: []byte("{{ \"1,001 Nights\" }}")},
},
}

where, err := Save(c, tmp)
@@ -171,6 +180,9 @@ func TestSaveDir(t *testing.T) {
Files: []*any.Any{
{TypeUrl: "scheherazade/shahryar.txt", Value: []byte("1,001 Nights")},
},
Templates: []*chart.Template{
{Name: "templates/scheherazade/shahryar.txt.tmpl", Data: []byte("{{ \"1,001 Nights\" }}")},
},
}

if err := SaveDir(c, tmp); err != nil {
@@ -191,4 +203,7 @@ func TestSaveDir(t *testing.T) {
if len(c2.Files) != 1 || c2.Files[0].TypeUrl != "scheherazade/shahryar.txt" {
t.Fatal("Files data did not match")
}
if len(c2.Templates) != 1 || c2.Templates[0].Name != "templates/scheherazade/shahryar.txt.tmpl" {
t.Fatal("Templates data did not match")
}
}

0 comments on commit 744cd20

Please sign in to comment.
You can’t perform that action at this time.