update

Author: reshnm

cmd/manageDeploymentRepo.go

@@ -2,17 +2,10 @@ package cmd
 
 import (
 	"fmt"
-	"os"
-	"path/filepath"
 
-	"github.com/go-git/go-git/v5"
 	deploymentrepo "github.com/openmcp-project/bootstrapper/internal/deployment-repo"
 	"github.com/openmcp-project/bootstrapper/internal/log"
-	ocmcli "github.com/openmcp-project/bootstrapper/internal/ocm-cli"
-	"github.com/openmcp-project/bootstrapper/internal/util"
 	"github.com/spf13/cobra"
-
-	gitconfig "github.com/openmcp-project/bootstrapper/internal/git-config"
 )
 
 const (
@@ -64,140 +57,56 @@ openmcp-bootstrapper manageDeploymentRepo <componentLocation> <templateResourceL
 		logger.Infof("Using platform services: %v", cmd.Flag(FlagPlatformService).Value.String())
 		logger.Infof("Using image pull secrets: %v", cmd.Flag(FlagImagePullSecret).Value.String())
 
-		tempDir, err := util.CreateTempDir("openmcp-bootstrapper-")
-		if err != nil {
-			return fmt.Errorf("failed to create temporary directory for deployment repository: %w", err)
-		}
-		logger.Tracef("Created temp dir: %s", tempDir)
-		defer func() {
-			logger.Tracef("Deleting temp dir: %s", tempDir)
-			if err := util.DeleteTempDir(tempDir); err != nil {
-				logger.Errorf("failed to delete temporary directory %s: %v", tempDir, err)
-			}
-		}()
-
-		templateDir := filepath.Join(tempDir, "templates")
-		err = os.Mkdir(templateDir, 0o755)
-		if err != nil {
-			return fmt.Errorf("failed to create template directory: %w", err)
-		}
-		logger.Tracef("Created template dir: %s", templateDir)
-
-		logger.Infof("Downloading component %s", componentLocation)
-
-		ocmGetter := ocmcli.NewComponentGetter(componentLocation, templateResourceLocation, cmd.Flag(FlagOcmConfig).Value.String())
-		err = ocmGetter.InitializeComponents(cmd.Context())
-		if err != nil {
-			return fmt.Errorf("failed to initialize components: %w", err)
-		}
-
-		logger.Infof("Downloading templates resource %s", templateResourceLocation)
-
-		err = ocmGetter.DownloadTemplatesResource(cmd.Context(), templateDir)
-		if err != nil {
-			return fmt.Errorf("failed to download templates resource: %w", err)
-		}
-
-		logger.Debug("parsing git config file from flag:", cmd.Flag(FlagGitConfig).Value.String())
-
-		gitDir := filepath.Join(tempDir, "repo")
-		err = os.Mkdir(gitDir, 0o755)
-		if err != nil {
-			return fmt.Errorf("failed to create git directory: %w", err)
-		}
-		logger.Tracef("Created git dir: %s", gitDir)
-
-		gitConfig, err := gitconfig.ParseConfig(cmd.Flag(FlagGitConfig).Value.String())
+		clusterProviders, err := cmd.Flags().GetStringArray(FlagClusterProvider)
 		if err != nil {
-			return fmt.Errorf("failed to parse git config: %w", err)
-		}
-		if err := gitConfig.Validate(); err != nil {
-			return fmt.Errorf("invalid git config: %w", err)
-		}
-
-		cloneOptions := &git.CloneOptions{
-			URL:      deploymentRepository,
-			Progress: LogWriter{},
+			return fmt.Errorf("failed to get cluster providers: %w", err)
 		}
-		if err := gitConfig.ConfigureCloneOptions(cloneOptions); err != nil {
-			return fmt.Errorf("failed to configure git clone options: %w", err)
-		}
-
-		logger.Infof("Cloning deployment repository %s", deploymentRepository)
-
-		repo, err := deploymentrepo.CloneRepo(deploymentRepository, gitDir, gitConfig)
+		serviceProviders, err := cmd.Flags().GetStringArray(FlagServiceProvider)
 		if err != nil {
-			return fmt.Errorf("failed to clone deployment repository: %w", err)
+			return fmt.Errorf("failed to get service providers: %w", err)
 		}
-
-		logger.Infof("Checking out or creating branch %s", deploymentRepositoryBranch)
-
-		err = deploymentrepo.CheckoutAndCreateBranchIfNotExists(repo, deploymentRepositoryBranch, gitConfig)
+		platformServices, err := cmd.Flags().GetStringArray(FlagPlatformService)
 		if err != nil {
-			return fmt.Errorf("failed to checkout or create branch %s: %w", deploymentRepositoryBranch, err)
+			return fmt.Errorf("failed to get platform services: %w", err)
 		}
-
-		logger.Infof("Applying templates from %s to deployment repository", templateResourceLocation)
-
 		imagePullSecrets, err := cmd.Flags().GetStringArray(FlagImagePullSecret)
 		if err != nil {
-			return fmt.Errorf("failed to get image pull secrets flag: %w", err)
-		}
-
-		templateInput := make(map[string]interface{})
-		openMCPOperatorCV, err := ocmGetter.GetReferencedComponentVersion(cmd.Context(), "openmcp-operator")
-		if err == nil {
-			logger.Infof("Found openmcp-operator component version: %s:%s", openMCPOperatorCV.Component.Name, openMCPOperatorCV.Component.Version)
-
-			imageResources := openMCPOperatorCV.GetResourcesByType(ocmcli.OCIImageResourceType)
-			if len(imageResources) == 0 || imageResources[0].Access.ImageReference == nil {
-				return fmt.Errorf("no image resource found for openmcp-operator component version %s:%s", openMCPOperatorCV.Component.Name, openMCPOperatorCV.Component.Version)
-			}
-
-			templateInput["openmcpOperator"] = map[string]interface{}{
-				"version":          openMCPOperatorCV.Component.Version,
-				"image":            *imageResources[0].Access.ImageReference,
-				"imagePullSecrets": imagePullSecrets,
-			}
+			return fmt.Errorf("failed to get image pull secrets: %w", err)
 		}
 
-		err = deploymentrepo.TemplateDir(templateDir, templateInput, repo)
-		if err != nil {
-			return fmt.Errorf("failed to apply templates from directory %s: %w", templateDir, err)
-		}
+		deploymentRepoManager, err := deploymentrepo.NewDeploymentRepoManager(
+			componentLocation,
+			templateResourceLocation,
+			deploymentRepository,
+			deploymentRepositoryBranch,
+			cmd.Flag(FlagGitConfig).Value.String(),
+		).WithOcmConfig(cmd.Flag(FlagOcmConfig).Value.String()).
+			WithClusterProviders(clusterProviders).
+			WithServiceProviders(serviceProviders).
+			WithPlatformServices(platformServices).
+			WithImagePullSecrets(imagePullSecrets).Complete(cmd.Context())
 
-		clusterProviders, err := cmd.Flags().GetStringArray(FlagClusterProvider)
-		if err != nil {
-			return fmt.Errorf("failed to get cluster providers flag: %w", err)
-		}
-
-		serviceProviders, err := cmd.Flags().GetStringArray(FlagServiceProvider)
-		if err != nil {
-			return fmt.Errorf("failed to get service providers flag: %w", err)
-		}
+		defer func() {
+			deploymentRepoManager.Cleanup()
+		}()
 
-		platformServices, err := cmd.Flags().GetStringArray(FlagPlatformService)
 		if err != nil {
-			return fmt.Errorf("failed to get platform services flag: %w", err)
+			return fmt.Errorf("failed to initialize deployment repo manager: %w", err)
 		}
 
-		logger.Infof("Templating providers: clusterProviders=%v, serviceProviders=%v, platformServices=%v, imagePullSecrets=%v", clusterProviders, serviceProviders, platformServices, imagePullSecrets)
-
-		err = deploymentrepo.TemplateProviders(cmd.Context(), clusterProviders, serviceProviders, platformServices, imagePullSecrets, ocmGetter, repo)
+		err = deploymentRepoManager.ApplyTemplates(cmd.Context())
 		if err != nil {
-			return fmt.Errorf("failed to template providers: %w", err)
+			return fmt.Errorf("failed to apply templates: %w", err)
 		}
 
-		logger.Info("Committing and pushing changes to deployment repository")
-
-		err = deploymentrepo.CommitChanges(repo, "apply templates", "openmcp", "[email protected]")
+		err = deploymentRepoManager.ApplyProviders(cmd.Context())
 		if err != nil {
-			return fmt.Errorf("failed to commit changes: %w", err)
+			return fmt.Errorf("failed to apply providers: %w", err)
 		}
 
-		err = deploymentrepo.PushRepo(repo, deploymentRepositoryBranch, gitConfig)
+		err = deploymentRepoManager.CommitAndPushChanges(cmd.Context())
 		if err != nil {
-			return fmt.Errorf("failed to push changes to deployment repository: %w", err)
+			return fmt.Errorf("failed to commit and push changes: %w", err)
 		}
 
 		return nil