upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename URLAreEqual func

Browse source
This commit is contained in:
Anton Galitsyn 2017-01-09 09:48:51 +07:00
parent a82c19b91a
commit e3f39f30bf
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/helm/downloader/manager.go
View file

@ -227,7 +227,7 @@ func (m *Manager) hasAllRepos(deps []*chartutil.Dependency) error {
found = true
} else {
for _, repo := range repos {
if urlutil.URLAreEqual(repo.URL, strings.TrimSuffix(dd.Repository, "/")) {
if urlutil.Equal(repo.URL, strings.TrimSuffix(dd.Repository, "/")) {
found = true
}
}
@ -259,7 +259,7 @@ func (m *Manager) getRepoNames(deps []*chartutil.Dependency) (map[string]string,
found := false
for _, repo := range repos {
if urlutil.URLAreEqual(repo.URL, dd.Repository) {
if urlutil.Equal(repo.URL, dd.Repository) {
found = true
reposMap[dd.Name] = repo.Name
break
@ -325,7 +325,7 @@ func (m *Manager) parallelRepoUpdate(repos []*repo.ChartRepositoryConfig) error
// If it finds a URL that is "relative", it will prepend the repoURL.
func findChartURL(name, version, repoURL string, repos map[string]*repo.ChartRepository) (string, error) {
for _, cr := range repos {
if urlutil.URLAreEqual(repoURL, cr.Config.URL) {
if urlutil.Equal(repoURL, cr.Config.URL) {
entry, err := findEntryByName(name, cr)
if err != nil {
return "", err

6
pkg/urlutil/urlutil.go
View file

@ -41,10 +41,8 @@ func URLJoin(baseURL string, paths ...string) (string, error) {
return u.String(), nil
}
// URLAreEqual normalizes two URLs and then compares for equality.
//
// TODO: This and the urlJoin functions should really be moved to a 'urlutil' package.
func URLAreEqual(a, b string) bool {
// Equal normalizes two URLs and then compares for equality.
func Equal(a, b string) bool {
au, err := url.Parse(a)
if err != nil {
a = filepath.Clean(a)

4
pkg/urlutil/urlutil_test.go
View file

@ -39,7 +39,7 @@ func TestUrlJoin(t *testing.T) {
}
}
func TestUrlAreEqual(t *testing.T) {
func TestEqual(t *testing.T) {
for _, tt := range []struct {
a, b string
match bool
@ -57,7 +57,7 @@ func TestUrlAreEqual(t *testing.T) {
{"/foo", "/foo/", true},
{"/foo/.", "/foo/", true},
} {
if tt.match != URLAreEqual(tt.a, tt.b) {
if tt.match != Equal(tt.a, tt.b) {
t.Errorf("Expected %q==%q to be %t", tt.a, tt.b, tt.match)
}
}