fixes after rebase

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

pkg/downloader/chart_downloader.go

@@ -29,6 +29,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/Masterminds/semver/v3"
 	"helm.sh/helm/v4/internal/fileutil"
 	ifs "helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/internal/urlutil"
@@ -297,11 +298,7 @@ func (c *ChartDownloader) DownloadToCache(ref, version string) (string, *provena
 			// Note, this does make an assumption that the name/version is unique to a
 			// hash when a provenance file is used. If this isn't true, this section of code
 			// will need to be reworked.
-			name := filepath.Base(u.Path)
+			name := c.getChartName(u.String())
-			if u.Scheme == registry.OCIScheme {
-				idx := strings.LastIndexByte(name, ':')
-				name = fmt.Sprintf("%s-%s.tgz", name[:idx], name[idx+1:])
-			}
 
 			// Copy chart to a known location with the right name for verification and then
 			// clean it up.
@@ -583,7 +580,7 @@ func (c *ChartDownloader) getChartName(url string) string {
 func (c *ChartDownloader) parseChartURL(ref string, version string) (*url.URL, error) {
 	u, err := url.Parse(ref)
 	if err != nil {
-		return nil, errors.Errorf("invalid chart URL format: %s", ref)
+		return nil, fmt.Errorf("invalid chart URL format: %s", ref)
 	}
 
 	if registry.IsOCI(u.String()) {
@@ -613,7 +610,7 @@ func (c *ChartDownloader) getOciTag(ref, version string) (string, error) {
 			return "", err
 		}
 		if len(tags) == 0 {
-			return "", errors.Errorf("Unable to locate any tags in provided repository: %s", ref)
+			return "", fmt.Errorf("Unable to locate any tags in provided repository: %s", ref)
 		}
 
 		// Determine if version provided

pkg/downloader/manager.go

@@ -334,7 +334,7 @@ func (m *Manager) downloadAll(deps []*chart.Dependency) error {
 		if registry.IsOCI(churl) {
 			churl, version, err = parseOCIRef(churl)
 			if err != nil {
-				return errors.Wrapf(err, "could not parse OCI reference")
+				return fmt.Errorf("could not parse OCI reference: %w", err)
 			}
 		}