From 9a4738291ce9ede3eec42eebabd6e9ec0a009dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <andreas@lindhe.io>
Date: Sat, 4 Apr 2020 17:37:14 +0200
Subject: [PATCH] Ignore already completed repos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Lindhé <andreas@lindhe.io>
---
 cmd/helm/repo_list.go   | 30 ++++++++++++++++++++++++++++--
 cmd/helm/repo_remove.go |  2 +-
 cmd/helm/search_repo.go |  2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/cmd/helm/repo_list.go b/cmd/helm/repo_list.go
index 25316bafc..80ae887f4 100644
--- a/cmd/helm/repo_list.go
+++ b/cmd/helm/repo_list.go
@@ -97,13 +97,39 @@ func (r *repoListWriter) encodeByFormat(out io.Writer, format output.Format) err
 	return nil
 }
 
+// Returns all repos from repos, except those with names matching ignoredRepoNames
+// Inspired by https://stackoverflow.com/a/28701031/893211
+func filterRepos(repos []*repo.Entry, ignoredRepoNames []string) []*repo.Entry {
+	// if ignoredRepoNames is nil, just return repo
+	if ignoredRepoNames == nil {
+		return repos
+	}
+
+	filteredRepos := make([]*repo.Entry, 0)
+
+	ignored := make(map[string]bool, 0)
+	for _, repo := range ignoredRepoNames {
+		ignored[repo] = true
+	}
+
+	for _, repo := range repos {
+		_, removed := ignored[repo.Name]
+		if !removed {
+			filteredRepos = append(filteredRepos, repo)
+		}
+	}
+
+	return filteredRepos
+}
+
 // Provide dynamic auto-completion for repo names
-func compListRepos(prefix string) []string {
+func compListRepos(prefix string, ignoredRepoNames []string) []string {
 	var rNames []string
 
 	f, err := repo.LoadFile(settings.RepositoryConfig)
 	if err == nil && len(f.Repositories) > 0 {
-		for _, repo := range f.Repositories {
+		filteredRepos := filterRepos(f.Repositories, ignoredRepoNames)
+		for _, repo := range filteredRepos {
 			if strings.HasPrefix(repo.Name, prefix) {
 				rNames = append(rNames, repo.Name)
 			}
diff --git a/cmd/helm/repo_remove.go b/cmd/helm/repo_remove.go
index 2e4f08e85..5dad4e5e0 100644
--- a/cmd/helm/repo_remove.go
+++ b/cmd/helm/repo_remove.go
@@ -55,7 +55,7 @@ func newRepoRemoveCmd(out io.Writer) *cobra.Command {
 
 	// Function providing dynamic auto-completion
 	completion.RegisterValidArgsFunc(cmd, func(cmd *cobra.Command, args []string, toComplete string) ([]string, completion.BashCompDirective) {
-		return compListRepos(toComplete), completion.BashCompDirectiveNoFileComp
+		return compListRepos(toComplete, args), completion.BashCompDirectiveNoFileComp
 	})
 
 	return cmd
diff --git a/cmd/helm/search_repo.go b/cmd/helm/search_repo.go
index 8a8ac379d..c7f0da974 100644
--- a/cmd/helm/search_repo.go
+++ b/cmd/helm/search_repo.go
@@ -298,7 +298,7 @@ func compListCharts(toComplete string, includeFiles bool) ([]string, completion.
 	var completions []string
 
 	// First check completions for repos
-	repos := compListRepos("")
+	repos := compListRepos("", nil)
 	for _, repo := range repos {
 		repoWithSlash := fmt.Sprintf("%s/", repo)
 		if strings.HasPrefix(toComplete, repoWithSlash) {