From b8f17ee8f5afef3c043ff4e07be8116d7c410189 Mon Sep 17 00:00:00 2001 From: Sebastien Plisson Date: Tue, 1 Oct 2019 13:04:02 -0700 Subject: [PATCH] Revert "ref(helm): expose Get for repository file" This reverts commit db578b51f820d53d88d5fa1fb9b8b39136410e54. Signed-off-by: Sebastien Plisson --- pkg/repo/repo.go | 14 ++++--------- pkg/repo/repo_test.go | 47 ++++--------------------------------------- 2 files changed, 8 insertions(+), 53 deletions(-) diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index 80166feea..fa550357a 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -117,18 +117,12 @@ func (r *RepoFile) Update(re ...*Entry) { // Has returns true if the given name is already a repository name. func (r *RepoFile) Has(name string) bool { - _, ok := r.Get(name) - return ok -} - -// Get returns entry by the given name if it exists. -func (r *RepoFile) Get(name string) (*Entry, bool) { - for _, entry := range r.Repositories { - if entry.Name == name { - return entry, true + for _, rf := range r.Repositories { + if rf.Name == name { + return true } } - return nil, false + return false } // Remove removes the entry from the list of repositories. diff --git a/pkg/repo/repo_test.go b/pkg/repo/repo_test.go index cf435d8c1..264e9bc3c 100644 --- a/pkg/repo/repo_test.go +++ b/pkg/repo/repo_test.go @@ -16,12 +16,10 @@ limitations under the License. package repo -import ( - "io/ioutil" - "os" - "strings" - "testing" -) +import "testing" +import "io/ioutil" +import "os" +import "strings" const testRepositoriesFile = "testdata/repositories.yaml" @@ -122,43 +120,6 @@ func TestNewPreV1RepositoriesFile(t *testing.T) { } } -func TestRepoFile_Get(t *testing.T) { - repo := NewRepoFile() - repo.Add( - &Entry{ - Name: "first", - URL: "https://example.com/first", - Cache: "first-index.yaml", - }, - &Entry{ - Name: "second", - URL: "https://example.com/second", - Cache: "second-index.yaml", - }, - &Entry{ - Name: "third", - URL: "https://example.com/third", - Cache: "third-index.yaml", - }, - &Entry{ - Name: "fourth", - URL: "https://example.com/fourth", - Cache: "fourth-index.yaml", - }, - ) - - name := "second" - - entry, ok := repo.Get(name) - if !ok { - t.Fatalf("Expected repo entry %q to be found", name) - } - - if entry.URL != "https://example.com/second" { - t.Fatalf("Expected repo URL to be %q but got %q", "https://example.com/second", entry.URL) - } -} - func TestRemoveRepository(t *testing.T) { sampleRepository := NewRepoFile() sampleRepository.Add(