strings.TrimSuffix

open-component-model · May 29, 2024 · 43fd92f · 43fd92f
1 parent 0aa2829
commit 43fd92f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/pkg/contexts/ocm/accessmethods/npm/method.go b/pkg/contexts/ocm/accessmethods/npm/method.go
@@ -98,12 +98,12 @@ func (a *AccessSpec) GetInexpensiveContentVersionIdentity(access accspeccpi.Comp
 
 // PackageUrl returns the URL of the NPM package (Registry/Package).
 func (a *AccessSpec) PackageUrl() string {
-	return a.Registry[:8] + path.Clean(path.Join(a.Registry[8:], a.Package))
+	return strings.TrimSuffix(a.Registry, "/") + path.Join("/", a.Package)
 }
 
 // PackageVersionUrl returns the URL of the NPM package-version (Registry/Package/Version).
 func (a *AccessSpec) PackageVersionUrl() string {
-	return a.Registry[:8] + path.Clean(path.Join(a.PackageUrl()[8:], a.Version))
+	return strings.TrimSuffix(a.Registry, "/") + path.Join("/", a.Package, a.Version)
 }
 
 func (a *AccessSpec) GetPackageVersion(ctx accspeccpi.Context) (*npm.Version, error) {

diff --git a/pkg/contexts/ocm/accessmethods/npm/method_test.go b/pkg/contexts/ocm/accessmethods/npm/method_test.go
@@ -69,10 +69,6 @@ var _ = Describe("Method", func() {
 		Expect(acc.PackageUrl()).To(Equal(packageUrl))
 		acc = npm.New("https://registry.npmjs.org/", "yargs", "17.7.1")
 		Expect(acc.PackageUrl()).To(Equal(packageUrl))
-		acc = npm.New("https://registry.npmjs.org/", "/yargs", "/17.7.1")
-		Expect(acc.PackageUrl()).To(Equal(packageUrl))
-		acc = npm.New("https://registry.npmjs.org//", "yargs", "17.7.1")
-		Expect(acc.PackageUrl()).To(Equal(packageUrl))
 	})
 
 	It("PackageVersionUrl()", func() {
@@ -81,9 +77,5 @@ var _ = Describe("Method", func() {
 		Expect(acc.PackageVersionUrl()).To(Equal(packageVersionUrl))
 		acc = npm.New("https://registry.npmjs.org/", "yargs", "17.7.1")
 		Expect(acc.PackageVersionUrl()).To(Equal(packageVersionUrl))
-		acc = npm.New("https://registry.npmjs.org/", "/yargs", "/17.7.1")
-		Expect(acc.PackageVersionUrl()).To(Equal(packageVersionUrl))
-		acc = npm.New("https://registry.npmjs.org//", "yargs", "17.7.1")
-		Expect(acc.PackageVersionUrl()).To(Equal(packageVersionUrl))
 	})
 })