From 8366b0948d5f7c6f9fcfa4a6aac78c44c47548da Mon Sep 17 00:00:00 2001
From: ffppmm <ffppmm@users.noreply.github.com>
Date: Tue, 5 Dec 2023 05:26:58 +0100
Subject: [PATCH] Added missing 'alias:' prefix for repository name as
 described here: (#15902)

Signed-off-by: Kevin Lyda <kevin@lyda.ie>
---
 reposerver/repository/repository.go             |  4 ++++
 reposerver/repository/repository_test.go        | 17 +++++++++++++++++
 .../helm-with-dependencies-alias/Chart.yaml     |  7 +++++++
 3 files changed, 28 insertions(+)
 create mode 100644 reposerver/repository/testdata/helm-with-dependencies-alias/Chart.yaml

diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
index 67c1d24e072d4..155ff8c6f8653 100644
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -1022,6 +1022,10 @@ func getHelmDependencyRepos(appPath string) ([]*v1alpha1.Repository, error) {
 			repos = append(repos, &v1alpha1.Repository{
 				Name: r.Repository[1:],
 			})
+		} else if strings.HasPrefix(r.Repository, "alias:") {
+			repos = append(repos, &v1alpha1.Repository{
+				Name: strings.TrimPrefix(r.Repository, "alias:"),
+			})
 		} else if u, err := url.Parse(r.Repository); err == nil && (u.Scheme == "https" || u.Scheme == "oci") {
 			repo := &v1alpha1.Repository{
 				// trimming oci:// prefix since it is currently not supported by Argo CD (OCI repos just have no scheme)
diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
index 74d09dd6f86b8..ab2225b6e778d 100644
--- a/reposerver/repository/repository_test.go
+++ b/reposerver/repository/repository_test.go
@@ -1440,6 +1440,7 @@ func TestListApps(t *testing.T) {
 		"out-of-bounds-values-file-link":    "Helm",
 		"values-files":                      "Helm",
 		"helm-with-dependencies":            "Helm",
+		"helm-with-dependencies-alias":      "Helm",
 	}
 	assert.Equal(t, expectedApps, res.Apps)
 }
@@ -2949,6 +2950,22 @@ func TestGetHelmRepo_NamedRepos(t *testing.T) {
 	assert.Equal(t, helmRepos[0].Repo, "https://example.com")
 }
 
+func TestGetHelmRepo_NamedReposAlias(t *testing.T) {
+	src := argoappv1.ApplicationSource{Path: "."}
+	q := apiclient.ManifestRequest{Repo: &argoappv1.Repository{}, ApplicationSource: &src, Repos: []*argoappv1.Repository{{
+		Name:     "custom-repo-alias",
+		Repo:     "https://example.com",
+		Username: "test-alias",
+	}}}
+
+	helmRepos, err := getHelmRepos("./testdata/helm-with-dependencies-alias", q.Repos, q.HelmRepoCreds)
+	assert.Nil(t, err)
+
+	assert.Equal(t, len(helmRepos), 1)
+	assert.Equal(t, helmRepos[0].Username, "test-alias")
+	assert.Equal(t, helmRepos[0].Repo, "https://example.com")
+}
+
 func Test_getResolvedValueFiles(t *testing.T) {
 	tempDir := t.TempDir()
 	paths := io.NewRandomizedTempPaths(tempDir)
diff --git a/reposerver/repository/testdata/helm-with-dependencies-alias/Chart.yaml b/reposerver/repository/testdata/helm-with-dependencies-alias/Chart.yaml
new file mode 100644
index 0000000000000..8a38d551070c7
--- /dev/null
+++ b/reposerver/repository/testdata/helm-with-dependencies-alias/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v2
+name: helm-with-dependencies-alias
+version: v1.0.0
+dependencies:
+  - name: helm
+    repository: "alias:custom-repo-alias"
+    version: v1.0.0