From d2dd32470b312095e8c7399146bc684b89ffeaa6 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Thu, 9 Sep 2021 08:40:04 -0700 Subject: [PATCH] fix tarFromLocalDir saving file dependencies in dest path Signed-off-by: Matthew Fisher --- pkg/downloader/manager.go | 8 +++----- pkg/downloader/manager_test.go | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index b5d7e26b3..cdd9f00dc 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -302,7 +302,7 @@ func (m *Manager) downloadAll(deps []*chart.Dependency) error { if m.Debug { fmt.Fprintf(m.Out, "Archiving %s from repo %s\n", dep.Name, dep.Repository) } - ver, err := tarFromLocalDir(m.ChartPath, dep.Name, dep.Repository, dep.Version) + ver, err := tarFromLocalDir(m.ChartPath, dep.Name, dep.Repository, dep.Version, tmpPath) if err != nil { saveError = err break @@ -852,10 +852,8 @@ func writeLock(chartpath string, lock *chart.Lock, legacyLockfile bool) error { return ioutil.WriteFile(dest, data, 0644) } -// archive a dep chart from local directory and save it into charts/ -func tarFromLocalDir(chartpath, name, repo, version string) (string, error) { - destPath := filepath.Join(chartpath, "charts") - +// archive a dep chart from local directory and save it into destPath +func tarFromLocalDir(chartpath, name, repo, version, destPath string) (string, error) { if !strings.HasPrefix(repo, "file://") { return "", errors.Errorf("wrong format: chart %s repository %s", name, repo) } diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go index 8b871e66e..4aa0fe11b 100644 --- a/pkg/downloader/manager_test.go +++ b/pkg/downloader/manager_test.go @@ -263,6 +263,10 @@ func TestDownloadAll(t *testing.T) { if err := m.downloadAll([]*chart.Dependency{signDep, localDep}); err != nil { t.Error(err) } + + if _, err := os.Stat(filepath.Join(chartPath, "charts", "signtest-0.1.0.tgz")); os.IsNotExist(err) { + t.Error(err) + } } func TestUpdateBeforeBuild(t *testing.T) {