fixes

Author: reshnm

internal/deployment-repo/deploymentRepoManager.go

@@ -194,7 +194,7 @@ func (m *DeploymentRepoManager) ApplyTemplates(ctx context.Context) error {
 	logger.Infof("Applying templates from %s to deployment repository", m.TemplateResourceLocation)
 
 	templateInput := make(map[string]interface{})
-	openMCPOperatorCV, err := m.compGetter.GetReferencedComponentVersion(ctx, openMCPOperatorComponentName)
+	openMCPOperatorCV, err := m.compGetter.GetReferencedComponentVersion(ctx, m.compGetter.RootComponentVersion(), openMCPOperatorComponentName)
 
 	if err == nil {
 		logger.Infof("Found openmcp-operator component version: %s:%s", openMCPOperatorCV.Component.Name, openMCPOperatorCV.Component.Version)

internal/deployment-repo/repo_test.go

@@ -5,10 +5,11 @@ import (
 	"testing"
 
 	"github.com/go-git/go-git/v5"
+	"github.com/stretchr/testify/assert"
+
 	deploymentrepo "github.com/openmcp-project/bootstrapper/internal/deployment-repo"
 	gitconfig "github.com/openmcp-project/bootstrapper/internal/git-config"
 	testutils "github.com/openmcp-project/bootstrapper/test/utils"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_Repo(t *testing.T) {

internal/deployment-repo/templater.go

@@ -124,7 +124,7 @@ type ProviderOptions struct {
 // TemplateProviders templates the specified cluster providers, service providers, and platform services
 func TemplateProviders(ctx context.Context, clusterProviders, serviceProviders, platformServices, imagePullSecrets []string, ocmGetter *ocmcli.ComponentGetter, repo *git.Repository) error {
 	for _, cp := range clusterProviders {
-		componentVersion, err := ocmGetter.GetReferencedComponentVersion(ctx, "cluster-provider-"+cp)
+		componentVersion, err := ocmGetter.GetReferencedComponentVersion(ctx, ocmGetter.RootComponentVersion(), "cluster-provider-"+cp)
 		if err != nil {
 			return fmt.Errorf("failed to get component version for cluster provider %s: %w", cp, err)
 		}
@@ -147,7 +147,7 @@ func TemplateProviders(ctx context.Context, clusterProviders, serviceProviders,
 	}
 
 	for _, sp := range serviceProviders {
-		componentVersion, err := ocmGetter.GetReferencedComponentVersion(ctx, "service-provider-"+sp)
+		componentVersion, err := ocmGetter.GetReferencedComponentVersion(ctx, ocmGetter.RootComponentVersion(), "service-provider-"+sp)
 		if err != nil {
 			return fmt.Errorf("failed to get component version for service provider %s: %w", sp, err)
 		}
@@ -170,7 +170,7 @@ func TemplateProviders(ctx context.Context, clusterProviders, serviceProviders,
 	}
 
 	for _, ps := range platformServices {
-		componentVersion, err := ocmGetter.GetReferencedComponentVersion(ctx, "platform-service-"+ps)
+		componentVersion, err := ocmGetter.GetReferencedComponentVersion(ctx, ocmGetter.RootComponentVersion(), "platform-service-"+ps)
 		if err != nil {
 			return fmt.Errorf("failed to get component version for platform service %s: %w", ps, err)
 		}

internal/deployment-repo/templater_test.go

@@ -5,11 +5,12 @@ import (
 	"testing"
 
 	"github.com/go-git/go-git/v5"
+	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/yaml"
+
 	deploymentrepo "github.com/openmcp-project/bootstrapper/internal/deployment-repo"
 	ocmcli "github.com/openmcp-project/bootstrapper/internal/ocm-cli"
 	testutils "github.com/openmcp-project/bootstrapper/test/utils"
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/yaml"
 )
 
 func TestTemplateDir(t *testing.T) {
@@ -35,6 +36,7 @@ func TestTemplateDir(t *testing.T) {
 	assert.Equal(t, "Hello, World!", templateResult)
 
 	workTree, err := repo.Worktree()
+	assert.NoError(t, err)
 	workTreeStatus, err := workTree.Status()
 	assert.NoError(t, err)
 	assert.False(t, workTreeStatus.IsClean())

internal/ocm-cli/component_getter.go

@@ -54,7 +54,7 @@ func (g *ComponentGetter) InitializeComponents(ctx context.Context) error {
 
 	cv := g.rootComponentVersion
 	for _, refName := range referenceNames {
-		cv, err = g.GetReferencedComponentVersion(ctx, refName)
+		cv, err = g.GetReferencedComponentVersion(ctx, cv, refName)
 		if err != nil {
 			return fmt.Errorf("error getting referenced component version %s: %w", refName, err)
 		}
@@ -77,8 +77,8 @@ func (g *ComponentGetter) TemplatesResourceName() string {
 	return g.templatesResourceName
 }
 
-func (g *ComponentGetter) GetReferencedComponentVersion(ctx context.Context, refName string) (*ComponentVersion, error) {
-	ref, err := g.rootComponentVersion.GetComponentReference(refName)
+func (g *ComponentGetter) GetReferencedComponentVersion(ctx context.Context, parentCV *ComponentVersion, refName string) (*ComponentVersion, error) {
+	ref, err := parentCV.GetComponentReference(refName)
 	if err != nil {
 		return nil, fmt.Errorf("error getting component reference %s: %w", refName, err)
 	}