use function from helm pkg

Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>

Author: somtochiama

internal/helm/repository/chart_repository.go

@@ -29,7 +29,6 @@ import (
 	"os"
 	"path"
 	"sort"
-	"strings"
 	"sync"
 	"time"
 
@@ -261,30 +260,16 @@ func (r *ChartRepository) DownloadChart(chart *repo.ChartVersion) (*bytes.Buffer
 	//  always the correct one to pick, check for updates once in awhile.
 	//  Ref: https://github.com/helm/helm/blob/v3.3.0/pkg/downloader/chart_downloader.go#L241
 	ref := chart.URLs[0]
-	u, err := url.Parse(ref)
+	resolvedUrl, err := repo.ResolveReferenceURL(r.URL, ref)
 	if err != nil {
-		err = fmt.Errorf("invalid chart URL format '%s': %w", ref, err)
 		return nil, err
 	}
 
-	// Prepend the chart repository base URL if the URL is relative
-	if !u.IsAbs() {
-		repoURL, err := url.Parse(r.URL)
-		if err != nil {
-			err = fmt.Errorf("invalid chart repository URL format '%s': %w", r.URL, err)
-			return nil, err
-		}
-		// Trailing slash is required for ResolveReference to work
-		repoURL.Path = strings.TrimSuffix(repoURL.Path, "/") + "/"
-		u = repoURL.ResolveReference(u)
-		u.RawQuery = repoURL.RawQuery
-	}
-
 	t := transport.NewOrIdle(r.tlsConfig)
 	clientOpts := append(r.Options, getter.WithTransport(t))
 	defer transport.Release(t)
 
-	return r.Client.Get(u.String(), clientOpts...)
+	return r.Client.Get(resolvedUrl, clientOpts...)
 }
 
 // LoadIndexFromBytes loads Index from the given bytes.

internal/helm/repository/utils.go

@@ -37,16 +37,12 @@ var (
 
 // NormalizeURL normalizes a ChartRepository URL by its scheme.
 func NormalizeURL(repositoryURL string) (string, error) {
-	if repositoryURL == "" {
-		return "", nil
-	}
-
 	u, err := url.Parse(repositoryURL)
 	if err != nil {
 		return "", err
 	}
 
-	if strings.Contains(repositoryURL, helmreg.OCIScheme) {
+	if u.Scheme == helmreg.OCIScheme {
 		u.Path = strings.TrimRight(u.Path, "/")
 		return u.String(), nil
 	}

internal/helm/repository/utils_test.go

@@ -43,11 +43,6 @@ func TestNormalizeURL(t *testing.T) {
 			url:  "http://example.com//",
 			want: "http://example.com/",
 		},
-		{
-			name: "empty",
-			url:  "",
-			want: "",
-		},
 		{
 			name: "oci with slash",
 			url:  "oci://example.com/",