From 447ce5a2ddfd5144e58e8f56c64d494dadb28506 Mon Sep 17 00:00:00 2001 From: Michelle Noorali Date: Fri, 20 May 2016 17:30:07 -0400 Subject: [PATCH 1/2] ref(helm): fix chart url in index file --- pkg/repo/repo.go | 4 +++- pkg/repo/repo_test.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index c8004905d..d2c0f14fd 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -135,7 +135,9 @@ func (r *ChartRepository) Index() error { created = time.Now().UTC().String() } - entry := &ChartRef{Chartfile: *chartfile, Name: chartfile.Name, URL: r.URL, Created: created, Digest: hash, Removed: false} + url := filepath.Join(r.URL, key+".tgz") + + entry := &ChartRef{Chartfile: *chartfile, Name: chartfile.Name, URL: url, Created: created, Digest: hash, Removed: false} r.IndexFile.Entries[key] = entry diff --git a/pkg/repo/repo_test.go b/pkg/repo/repo_test.go index 3680691c5..557ab3b41 100644 --- a/pkg/repo/repo_test.go +++ b/pkg/repo/repo_test.go @@ -90,6 +90,10 @@ func TestIndex(t *testing.T) { if v.Created != created { t.Errorf("Expected Created timestamp to be %s, but got %s for chart %s", created, v.Created, chart) } + expectedURL := filepath.Join(cr.URL, chart+".tgz") + if v.URL != expectedURL { + t.Errorf("Expected url in entry to be %s but got %s for chart: %s", expectedURL, v.URL, chart) + } } } From b4844383aab9c75d00ceb098c5905819f2fcc52b Mon Sep 17 00:00:00 2001 From: Michelle Noorali Date: Fri, 20 May 2016 17:36:23 -0400 Subject: [PATCH 2/2] ref(helm): digest -> checksum in index file --- pkg/repo/index.go | 2 +- pkg/repo/repo.go | 6 +++--- pkg/repo/repo_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/repo/index.go b/pkg/repo/index.go index 6e2c1920d..f61ba57c6 100644 --- a/pkg/repo/index.go +++ b/pkg/repo/index.go @@ -23,7 +23,7 @@ type ChartRef struct { URL string `yaml:"url"` Created string `yaml:"created,omitempty"` Removed bool `yaml:"removed,omitempty"` - Digest string `yaml:"digest,omitempty"` + Checksum string `yaml:"checksum,omitempty"` Chartfile chart.Chartfile `yaml:"chartfile"` } diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index d2c0f14fd..b5a388020 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -117,7 +117,7 @@ func (r *ChartRepository) Index() error { } chartfile := ch.Chartfile() - hash, err := generateDigest(path) + hash, err := generateChecksum(path) if err != nil { return err } @@ -137,7 +137,7 @@ func (r *ChartRepository) Index() error { url := filepath.Join(r.URL, key+".tgz") - entry := &ChartRef{Chartfile: *chartfile, Name: chartfile.Name, URL: url, Created: created, Digest: hash, Removed: false} + entry := &ChartRef{Chartfile: *chartfile, Name: chartfile.Name, URL: url, Created: created, Checksum: hash, Removed: false} r.IndexFile.Entries[key] = entry @@ -150,7 +150,7 @@ func (r *ChartRepository) Index() error { return nil } -func generateDigest(path string) (string, error) { +func generateChecksum(path string) (string, error) { f, err := os.Open(path) if err != nil { return "", err diff --git a/pkg/repo/repo_test.go b/pkg/repo/repo_test.go index 557ab3b41..7593d67fd 100644 --- a/pkg/repo/repo_test.go +++ b/pkg/repo/repo_test.go @@ -69,8 +69,8 @@ func TestIndex(t *testing.T) { } timestamps[chartName] = details.Created - if details.Digest == "" { - t.Errorf("Digest was not set for %s", chartName) + if details.Checksum == "" { + t.Errorf("Checksum was not set for %s", chartName) } }