Skip to content

Commit d54a655

Browse files
authored
Merge pull request #1013 from fluxcd/helm-oci-download-err
helm/oci: Add context to chart download failure
2 parents b00658d + f9927e7 commit d54a655

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

internal/helm/chart/builder_remote_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ entries:
225225
}
226226
}
227227

228-
func TestRemoteBuilder_BuildFromOCIChatRepository(t *testing.T) {
228+
func TestRemoteBuilder_BuildFromOCIChartRepository(t *testing.T) {
229229
g := NewWithT(t)
230230

231231
chartGrafana, err := os.ReadFile("./../testdata/charts/helmchart-0.1.0.tgz")
@@ -293,7 +293,7 @@ func TestRemoteBuilder_BuildFromOCIChatRepository(t *testing.T) {
293293
name: "chart version not in repository",
294294
reference: RemoteReference{Name: "grafana", Version: "1.1.1"},
295295
repository: mockRepoWithoutChart(),
296-
wantErr: "failed to download chart for remote reference",
296+
wantErr: "failed to download chart for remote reference: failed to get",
297297
},
298298
{
299299
name: "invalid version metadata",

internal/helm/repository/oci_chart_repository.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,11 @@ func (r *OCIChartRepository) DownloadChart(chart *repo.ChartVersion) (*bytes.Buf
231231
defer transport.Release(t)
232232

233233
// trim the oci scheme prefix if needed
234-
return r.Client.Get(strings.TrimPrefix(u.String(), fmt.Sprintf("%s://", registry.OCIScheme)), clientOpts...)
234+
b, err := r.Client.Get(strings.TrimPrefix(u.String(), fmt.Sprintf("%s://", registry.OCIScheme)), clientOpts...)
235+
if err != nil {
236+
return nil, fmt.Errorf("failed to get '%s': %w", ref, err)
237+
}
238+
return b, nil
235239
}
236240

237241
// Login attempts to login to the OCI registry.

0 commit comments

Comments
 (0)