Add extra error info when downloading remote charts

Refers to: #3160 Signed-off-by: Xavi Garcia <[email protected]>
rancher · Feb 18, 2025 · 5952a0a · 5952a0a
1 parent e6df5eb
commit 5952a0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/integrationtests/cli/apply/helm_test.go b/integrationtests/cli/apply/helm_test.go
@@ -170,7 +170,7 @@ func testHelmRepo(path, port string) {
 				})
 				Expect(err).To(HaveOccurred())
 				return err.Error()
-			}).Should(Equal("error parsing regexp: missing closing ): `a(b`"))
+			}).Should(Equal("repo= chart=http://localhost:3000/config-chart-0.1.0.tgz version=: error parsing regexp: missing closing ): `a(b`"))
 		})
 	})
 

diff --git a/internal/bundlereader/resources.go b/internal/bundlereader/resources.go
@@ -154,15 +154,15 @@ func addRemoteCharts(directories []directory, base string, charts []*fleet.HelmO
 		if _, err := os.Stat(filepath.Join(base, chart.Chart)); os.IsNotExist(err) || chart.Repo != "" {
 			shouldAddAuthToRequest, err := shouldAddAuthToRequest(helmRepoURLRegex, chart.Repo, chart.Chart)
 			if err != nil {
-				return nil, err
+				return nil, downloadChartError(*chart, err)
 			}
 			if !shouldAddAuthToRequest {
 				auth = Auth{}
 			}
 
 			chartURL, err := chartURL(*chart, auth)
 			if err != nil {
-				return nil, err
+				return nil, downloadChartError(*chart, err)
 			}
 
 			directories = append(directories, directory{
@@ -178,6 +178,16 @@ func addRemoteCharts(directories []directory, base string, charts []*fleet.HelmO
 	return directories, nil
 }
 
+func downloadChartError(c fleet.HelmOptions, e error) error {
+	return fmt.Errorf(
+		"repo=%s chart=%s version=%s: %w",
+		c.Repo,
+		c.Chart,
+		c.Version,
+		e,
+	)
+}
+
 func shouldAddAuthToRequest(helmRepoURLRegex, repo, chart string) (bool, error) {
 	if helmRepoURLRegex == "" {
 		return true, nil