diff --git a/internal/fileutil/fileutil.go b/internal/fileutil/fileutil.go index 18ff10a4a..8a889f495 100644 --- a/internal/fileutil/fileutil.go +++ b/internal/fileutil/fileutil.go @@ -91,6 +91,9 @@ func CompressDirToTgz(chartTmpDir, tmpdir string) (*bytes.Buffer, error) { // (see https://golang.org/src/archive/tar/common.go?#L626) header.Name = strings.TrimPrefix(filepath.ToSlash(file), tmpdir+"/") header.ModTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) + header.AccessTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) + header.ChangeTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) + header.Format = tar.FormatGNU // write header if err := tw.WriteHeader(header); err != nil { diff --git a/internal/fileutil/fileutil_test.go b/internal/fileutil/fileutil_test.go index 6d2b8d03e..ac10dbac6 100644 --- a/internal/fileutil/fileutil_test.go +++ b/internal/fileutil/fileutil_test.go @@ -63,8 +63,8 @@ func TestCompressDirToTgz(t *testing.T) { testDataDir := "testdata" chartTestDir := "testdata/helmchart" - expectMd5Value := "47e407d2251866226cb7df4c44028091" - expectChartBytesLen := 3990 + expectMd5Value := "218a88e89fa53efc6dd56aab27159880" + expectChartBytesLen := 3998 chartBytes, err := CompressDirToTgz(chartTestDir, testDataDir) if err != nil { diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go index f07cf274b..720b3e69b 100644 --- a/pkg/downloader/chart_downloader.go +++ b/pkg/downloader/chart_downloader.go @@ -118,7 +118,7 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven name = fmt.Sprintf("%s-%s.tgz", name[:idx], name[idx+1:]) } if scheme == "git" { - gitGetter, ok := g.(*getter.GITGetter) + gitGetter, ok := g.(*getter.GitGetter) if !ok { return "", nil, fmt.Errorf("can't convert to GITGetter") } diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go index 489a7f6c9..a9e33524c 100644 --- a/pkg/getter/getter.go +++ b/pkg/getter/getter.go @@ -190,7 +190,7 @@ var ociProvider = Provider{ var gitProvider = Provider{ Schemes: []string{"git"}, - New: NewGITGetter, + New: NewGitGetter, } // All finds all of the registered getters as a list of Provider instances. diff --git a/pkg/getter/gitgetter.go b/pkg/getter/gitgetter.go index 470e51681..cc901839b 100644 --- a/pkg/getter/gitgetter.go +++ b/pkg/getter/gitgetter.go @@ -30,18 +30,18 @@ import ( // Assigned here so it can be overridden for testing. var gitCloneTo = gitutil.CloneTo -// GITGetter is the default HTTP(/S) backend handler -type GITGetter struct { +// GitGetter is the default HTTP(/S) backend handler +type GitGetter struct { opts options } -func (g *GITGetter) ChartName() string { +func (g *GitGetter) ChartName() string { return g.opts.chartName } // ensureGitDirIgnored will append ".git/" to the .helmignore file in a directory. // Create the .helmignore file if it does not exist. -func (g *GITGetter) ensureGitDirIgnored(repoPath string) error { +func (g *GitGetter) ensureGitDirIgnored(repoPath string) error { helmignorePath := filepath.Join(repoPath, ".helmignore") f, err := os.OpenFile(helmignorePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { @@ -55,14 +55,14 @@ func (g *GITGetter) ensureGitDirIgnored(repoPath string) error { } //Get performs a Get from repo.Getter and returns the body. -func (g *GITGetter) Get(href string, options ...Option) (*bytes.Buffer, error) { +func (g *GitGetter) Get(href string, options ...Option) (*bytes.Buffer, error) { for _, opt := range options { opt(&g.opts) } return g.get(href) } -func (g *GITGetter) get(href string) (*bytes.Buffer, error) { +func (g *GitGetter) get(href string) (*bytes.Buffer, error) { gitURL := strings.TrimPrefix(href, "git://") version := g.opts.version chartName := g.opts.chartName @@ -96,10 +96,10 @@ func (g *GITGetter) get(href string) (*bytes.Buffer, error) { return buf, nil } -// NewGITGetter constructs a valid git client as a Getter -func NewGITGetter(ops ...Option) (Getter, error) { +// NewGitGetter constructs a valid git client as a Getter +func NewGitGetter(ops ...Option) (Getter, error) { - client := GITGetter{} + client := GitGetter{} for _, opt := range ops { opt(&client.opts) diff --git a/pkg/getter/gitgetter_test.go b/pkg/getter/gitgetter_test.go index cf82edbb3..94bbb0d62 100644 --- a/pkg/getter/gitgetter_test.go +++ b/pkg/getter/gitgetter_test.go @@ -20,12 +20,12 @@ import ( ) func TestNewGITGetter(t *testing.T) { - g, err := NewGITGetter() + g, err := NewGitGetter() if err != nil { t.Fatal(err) } - if _, ok := g.(*GITGetter); !ok { + if _, ok := g.(*GitGetter); !ok { t.Fatal("Expected NewGITGetter to produce an *GITGetter") } }