From dd8d409a7458f20dea425eabf7865a723c856e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Marc=C3=A9?= Date: Wed, 16 Oct 2024 19:36:33 +0200 Subject: [PATCH 1/2] test Allow same deps with same name but different repo. related #7413 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tarek Marcé --- internal/resolver/resolver_test.go | 15 ++++++++++++++- ...charts-index.yaml => repository-1-index.yaml} | 0 .../testdata/repository/repository-2-index.yaml | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) rename internal/resolver/testdata/repository/{kubernetes-charts-index.yaml => repository-1-index.yaml} (100%) create mode 100644 internal/resolver/testdata/repository/repository-2-index.yaml diff --git a/internal/resolver/resolver_test.go b/internal/resolver/resolver_test.go index 1e33837a9..11b636d60 100644 --- a/internal/resolver/resolver_test.go +++ b/internal/resolver/resolver_test.go @@ -137,9 +137,22 @@ func TestResolve(t *testing.T) { }, err: true, }, + { + name: "charts with same name but different repo", + req: []*chart.Dependency{ + {Name: "alpine", Repository: "repository-1", Version: "0.1.0"}, + {Name: "alpine", Repository: "repository-2", Version: "0.3.0", Alias: "alpine-alias"}, + }, + expect: &chart.Lock{ + Dependencies: []*chart.Dependency{ + {Name: "alpine", Repository: "repository-1", Version: "0.1.0"}, + {Name: "alpine", Repository: "repository-2", Version: "0.3.0"}, + }, + }, + }, } - repoNames := map[string]string{"alpine": "kubernetes-charts", "redis": "kubernetes-charts"} + repoNames := map[string]string{"alpine": "repository-1", "redis": "repository-1", "alpine-alias": "repository-2"} registryClient, _ := registry.NewClient() r := New("testdata/chartpath", "testdata/repository", registryClient) for _, tt := range tests { diff --git a/internal/resolver/testdata/repository/kubernetes-charts-index.yaml b/internal/resolver/testdata/repository/repository-1-index.yaml similarity index 100% rename from internal/resolver/testdata/repository/kubernetes-charts-index.yaml rename to internal/resolver/testdata/repository/repository-1-index.yaml diff --git a/internal/resolver/testdata/repository/repository-2-index.yaml b/internal/resolver/testdata/repository/repository-2-index.yaml new file mode 100644 index 000000000..daa3591bb --- /dev/null +++ b/internal/resolver/testdata/repository/repository-2-index.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +entries: + alpine: + - name: alpine + urls: + - https://charts.helm.sh/stable/alpine-0.1.0.tgz + checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d + home: https://helm.sh/helm + sources: + - https://github.com/helm/helm + version: 0.3.0 + description: Deploy a basic Alpine Linux pod + keywords: [] + maintainers: [] + icon: "" + apiVersion: v2 From 6bd8277e2d1d034a5cc0ccd228199b3033a8c348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Marc=C3=A9?= Date: Wed, 16 Oct 2024 19:56:01 +0200 Subject: [PATCH 2/2] Allow same deps with same name but different repo. Fix #7413 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tarek Marcé --- internal/resolver/resolver.go | 4 ++++ pkg/downloader/manager.go | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go index 13dcd2ce9..4ebdb0801 100644 --- a/internal/resolver/resolver.go +++ b/internal/resolver/resolver.go @@ -108,6 +108,10 @@ func (r *Resolver) Resolve(reqs []*chart.Dependency, repoNames map[string]string } repoName := repoNames[d.Name] + if d.Alias != "" { + repoName = repoNames[d.Alias] + } + // if the repository was not defined, but the dependency defines a repository url, bypass the cache if repoName == "" && d.Repository != "" { locked[i] = &chart.Dependency{ diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index 348c78edb..eaaf00c1c 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -572,6 +572,10 @@ func (m *Manager) resolveRepoNames(deps []*chart.Dependency) (map[string]string, // by Helm. missing := []string{} for _, dd := range deps { + chartName := dd.Name + if dd.Alias != "" { + chartName = dd.Alias + } // Don't map the repository, we don't need to download chart from charts directory if dd.Repository == "" { continue @@ -585,12 +589,12 @@ func (m *Manager) resolveRepoNames(deps []*chart.Dependency) (map[string]string, if m.Debug { fmt.Fprintf(m.Out, "Repository from local path: %s\n", dd.Repository) } - reposMap[dd.Name] = dd.Repository + reposMap[chartName] = dd.Repository continue } if registry.IsOCI(dd.Repository) { - reposMap[dd.Name] = dd.Repository + reposMap[chartName] = dd.Repository continue } @@ -601,11 +605,11 @@ func (m *Manager) resolveRepoNames(deps []*chart.Dependency) (map[string]string, (strings.HasPrefix(dd.Repository, "alias:") && strings.TrimPrefix(dd.Repository, "alias:") == repo.Name) { found = true dd.Repository = repo.URL - reposMap[dd.Name] = repo.Name + reposMap[chartName] = repo.Name break } else if urlutil.Equal(repo.URL, dd.Repository) { found = true - reposMap[dd.Name] = repo.Name + reposMap[chartName] = repo.Name break } }