|
1 | | -// Copyright 2021-2023 the Kubeapps contributors. |
| 1 | +// Copyright 2021-2023 the Kubeapps contribchart.ChartVersionsutors. |
2 | 2 | // SPDX-License-Identifier: Apache-2.0 |
3 | 3 |
|
4 | 4 | package cache |
@@ -165,11 +165,18 @@ func (c *ChartCache) SyncCharts(charts []models.Chart, downloadFn DownloadChartF |
165 | 165 | u.RawQuery = q.Encode() |
166 | 166 | } |
167 | 167 |
|
| 168 | + rawURL := chart.ChartVersions[0].URLs[0] |
| 169 | + fullURL, err := resolveChartURL(chart.Repo.URL, rawURL) |
| 170 | + if err != nil { |
| 171 | + log.Warningf("Skipping chart [%s]: %v", chart.ID, err) |
| 172 | + continue |
| 173 | + } |
| 174 | + |
168 | 175 | entry := chartCacheStoreEntry{ |
169 | 176 | namespace: chart.Repo.Namespace, |
170 | 177 | id: chart.ID, |
171 | 178 | version: chart.ChartVersions[0].Version, |
172 | | - url: u.String(), |
| 179 | + url: fullURL, |
173 | 180 | downloadFn: downloadFn, |
174 | 181 | deleted: false, |
175 | 182 | } |
@@ -538,13 +545,18 @@ func (c *ChartCache) Get(key string, chart *models.Chart, downloadFn DownloadCha |
538 | 545 | if len(v.URLs) == 0 { |
539 | 546 | log.Warningf("The chart: [%s], version: [%s] has no URLs", chart.ID, v.Version) |
540 | 547 | } else { |
| 548 | + fullURL, err := resolveChartURL(chart.Repo.URL, v.URLs[0]) |
| 549 | + if err != nil { |
| 550 | + return nil, err |
| 551 | + } |
541 | 552 | entry = &chartCacheStoreEntry{ |
542 | 553 | namespace: namespace, |
543 | 554 | id: chartID, |
544 | 555 | version: v.Version, |
545 | | - url: v.URLs[0], |
| 556 | + url: fullURL, |
546 | 557 | downloadFn: downloadFn, |
547 | 558 | } |
| 559 | + |
548 | 560 | } |
549 | 561 | break |
550 | 562 | } |
@@ -695,3 +707,21 @@ func ChartCacheComputeValue(chartID, chartUrl, chartVersion string, downloadFn D |
695 | 707 | return gobBuf.Bytes(), nil |
696 | 708 | } |
697 | 709 | } |
| 710 | + |
| 711 | +func resolveChartURL(repo string, chartPath string) (string, error) { |
| 712 | + u, err := url.Parse(chartPath) |
| 713 | + if err != nil { |
| 714 | + return "", fmt.Errorf("invalid chart URL %q: %w", chartPath, err) |
| 715 | + } |
| 716 | + if u.IsAbs() { // уже полный URL |
| 717 | + return u.String(), nil |
| 718 | + } |
| 719 | + |
| 720 | + base, err := url.Parse(repo) |
| 721 | + if err != nil { |
| 722 | + return "", fmt.Errorf("invalid repo URL %q: %w", repo, err) |
| 723 | + } |
| 724 | + // гарантируем, что в конце есть ровно один «/» |
| 725 | + base.Path = strings.TrimSuffix(base.Path, "/") + "/" |
| 726 | + return base.ResolveReference(u).String(), nil |
| 727 | +} |
0 commit comments