From f6830f7b0ab91909454fbdc476b4e760d6525abc Mon Sep 17 00:00:00 2001
From: CI <ci@argoproj.com>
Date: Thu, 21 Jul 2022 12:29:14 -0400
Subject: [PATCH] fix: clean up temp files in
 FindChartInAuthAndTLSAndPassRepoURL (#11171)

Signed-off-by: CI <ci@argoproj.com>
(cherry picked from commit 24fa3d910d774b9d7f40f1fc8002bc1fb55565ca)
---
 cmd/helm/repo_add.go      |  2 +-
 cmd/helm/repo_update.go   |  2 +-
 pkg/downloader/manager.go |  2 +-
 pkg/repo/chartrepo.go     | 17 ++++++++++-------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cmd/helm/repo_add.go b/cmd/helm/repo_add.go
index e13df7ad826..a4743d605c3 100644
--- a/cmd/helm/repo_add.go
+++ b/cmd/helm/repo_add.go
@@ -207,7 +207,7 @@ func (o *repoAddOptions) run(out io.Writer) error {
 	if o.repoCache != "" {
 		r.CachePath = o.repoCache
 	}
-	if _, err := r.DownloadIndexFile(); err != nil {
+	if _, _, err := r.DownloadIndexFile(); err != nil {
 		return errors.Wrapf(err, "looks like %q is not a valid chart repository or cannot be reached", o.url)
 	}
 
diff --git a/cmd/helm/repo_update.go b/cmd/helm/repo_update.go
index 27661674cb7..122293253a4 100644
--- a/cmd/helm/repo_update.go
+++ b/cmd/helm/repo_update.go
@@ -122,7 +122,7 @@ func updateCharts(repos []*repo.ChartRepository, out io.Writer, failOnRepoUpdate
 		wg.Add(1)
 		go func(re *repo.ChartRepository) {
 			defer wg.Done()
-			if _, err := re.DownloadIndexFile(); err != nil {
+			if _, _, err := re.DownloadIndexFile(); err != nil {
 				fmt.Fprintf(out, "...Unable to get an update from the %q chart repository (%s):\n\t%s\n", re.Config.Name, re.Config.URL, err)
 				repoFailList = append(repoFailList, re.Config.URL)
 			} else {
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 18b28dde194..226aa186780 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -670,7 +670,7 @@ func (m *Manager) parallelRepoUpdate(repos []*repo.Entry) error {
 		}
 		wg.Add(1)
 		go func(r *repo.ChartRepository) {
-			if _, err := r.DownloadIndexFile(); err != nil {
+			if _, _, err := r.DownloadIndexFile(); err != nil {
 				// For those dependencies that are not known to helm and using a
 				// generated key name we display the repo url.
 				if strings.HasPrefix(r.Config.Name, managerKeyPrefix) {
diff --git a/pkg/repo/chartrepo.go b/pkg/repo/chartrepo.go
index 956997cc9f7..3a5f34eeb62 100644
--- a/pkg/repo/chartrepo.go
+++ b/pkg/repo/chartrepo.go
@@ -115,10 +115,10 @@ func (r *ChartRepository) Load() error {
 }
 
 // DownloadIndexFile fetches the index from a repository.
-func (r *ChartRepository) DownloadIndexFile() (string, error) {
+func (r *ChartRepository) DownloadIndexFile() (string, string, error) {
 	parsedURL, err := url.Parse(r.Config.URL)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 	parsedURL.RawPath = path.Join(parsedURL.RawPath, "index.yaml")
 	parsedURL.Path = path.Join(parsedURL.Path, "index.yaml")
@@ -133,17 +133,17 @@ func (r *ChartRepository) DownloadIndexFile() (string, error) {
 		getter.WithPassCredentialsAll(r.Config.PassCredentialsAll),
 	)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	index, err := ioutil.ReadAll(resp)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	indexFile, err := loadIndex(index, r.Config.URL)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	// Create the chart list file in the cache directory
@@ -158,7 +158,7 @@ func (r *ChartRepository) DownloadIndexFile() (string, error) {
 	// Create the index file in the cache directory
 	fname := filepath.Join(r.CachePath, helmpath.CacheIndexFile(r.Config.Name))
 	os.MkdirAll(filepath.Dir(fname), 0755)
-	return fname, ioutil.WriteFile(fname, index, 0644)
+	return fname, chartsFile, ioutil.WriteFile(fname, index, 0644)
 }
 
 // Index generates an index for the chart repository and writes an index.yaml file.
@@ -249,10 +249,13 @@ func FindChartInAuthAndTLSAndPassRepoURL(repoURL, username, password, chartName,
 	if err != nil {
 		return "", err
 	}
-	idx, err := r.DownloadIndexFile()
+	idx, chart, err := r.DownloadIndexFile()
 	if err != nil {
 		return "", errors.Wrapf(err, "looks like %q is not a valid chart repository or cannot be reached", repoURL)
 	}
+	// Clean up temp files.
+	defer os.RemoveAll(idx)
+	defer os.RemoveAll(chart)
 
 	// Read the index file for the repository to get chart information and return chart URL
 	repoIndex, err := LoadIndexFile(idx)