feat: fix appending repositroy name that is no longer needed (#29)

open-component-model · Jul 12, 2023 · 89cdaff · 89cdaff
1 parent 4792a9c
commit 89cdaff
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/shared/oci.go b/shared/oci.go
@@ -109,7 +109,7 @@ type ComponentModification func(compvers ocm.ComponentVersionAccess) error
 
 // AddComponentVersionToRepository takes a component description and optional resources. Then pushes that component
 // into the locally forwarded registry.
-func AddComponentVersionToRepository(component Component, repository, scheme string, componentModifications ...ComponentModification) error {
+func AddComponentVersionToRepository(component Component, scheme string, componentModifications ...ComponentModification) error {
 	u, err := url.Parse("https://127.0.0.1:5000")
 	if err != nil {
 		return fmt.Errorf("failed to parse base url: %w", err)
@@ -122,9 +122,6 @@ func AddComponentVersionToRepository(component Component, repository, scheme str
 		return fmt.Errorf("failed to reparse base url: %w", err)
 	}
 
-	// join up with the repository.
-	u = u.JoinPath(repository)
-
 	baseURL := u.String()
 	octx := ocm.FromContext(context.Background())
 

diff --git a/shared/steps/setup/add_component_version.go b/shared/steps/setup/add_component_version.go
@@ -17,7 +17,6 @@ import (
 // Component contains information about a component to add.
 type Component struct {
 	Component                     shared.Component
-	Repository                    string
 	Scheme                        string
 	ComponentVersionModifications []shared.ComponentModification
 }
@@ -32,7 +31,7 @@ func AddComponentVersions(components ...Component) features.Func {
 			if c.Scheme != "" {
 				scheme = c.Scheme
 			}
-			if err := shared.AddComponentVersionToRepository(c.Component, c.Repository, scheme, c.ComponentVersionModifications...); err != nil {
+			if err := shared.AddComponentVersionToRepository(c.Component, scheme, c.ComponentVersionModifications...); err != nil {
 				t.Fatal(err)
 			}
 		}

diff --git a/test/componentversion/component_version_test.go b/test/componentversion/component_version_test.go
@@ -38,7 +38,6 @@ func TestComponentVersionApply(t *testing.T) {
 				Name:    "github.com/acme/podinfo",
 				Version: "v6.0.0",
 			},
-			Repository: "ocm-podinfo",
 		})).
 		Setup(setup.ApplyTestData(namespace, "testdata", "*")).
 		Assess("check if resource was created", assess.ResourceWasCreated(assess.Object{

diff --git a/test/gitsync/sync_test.go b/test/gitsync/sync_test.go
@@ -45,7 +45,6 @@ func TestSyncApply(t *testing.T) {
 				Name:    "github.com/acme/podinfo",
 				Version: "v6.0.0",
 			},
-			Repository: "podinfo",
 			ComponentVersionModifications: []shared.ComponentModification{
 				shared.BlobResource(shared.Resource{
 					Name: "deployment",
@@ -189,7 +188,6 @@ func TestSyncApplyWithPullRequest(t *testing.T) {
 				Name:    "github.com/acme/podinfo",
 				Version: "v6.0.0",
 			},
-			Repository: "podinfo",
 			ComponentVersionModifications: []shared.ComponentModification{
 				shared.BlobResource(shared.Resource{
 					Name: "deployment",

diff --git a/test/subscription/subscription_test.go b/test/subscription/subscription_test.go
@@ -38,7 +38,6 @@ func TestComponentSubscribeApply(t *testing.T) {
 				Name:    "github.com/acme/podinfo",
 				Version: "v1.0.0",
 			},
-			Repository: "ocm-replication",
 		})).
 		Setup(setup.ApplyTestData(namespace, "testdata", "*")).
 		Assess("check if resource was created",