refactor: implements new git types for common operations (#127)

input-output-hk · Jan 30, 2025 · 9bb1772 · 9bb1772
1 parent b4c191c
commit 9bb1772
Show file tree

Hide file tree

Showing 57 changed files with 2,211 additions and 1,511 deletions.
diff --git a/cli/blueprint.cue b/cli/blueprint.cue
@@ -21,10 +21,6 @@ project: {
 			config: {
 				name:   string | *"dev" @forge(name="GIT_TAG")
 				prefix: project.name
-				token: {
-					provider: "env"
-					path:     "GITHUB_TOKEN"
-				}
 			}
 		}
 	}

diff --git a/cli/cmd/cmds/module/deploy.go b/cli/cmd/cmds/module/deploy.go
@@ -3,9 +3,9 @@ package module
 import (
 	"fmt"
 
-	"github.com/input-output-hk/catalyst-forge/cli/pkg/deployment"
 	"github.com/input-output-hk/catalyst-forge/cli/pkg/events"
 	"github.com/input-output-hk/catalyst-forge/cli/pkg/run"
+	"github.com/input-output-hk/catalyst-forge/lib/project/deployment/deployer"
 )
 
 type DeployCmd struct {
@@ -26,18 +26,14 @@ func (c *DeployCmd) Run(ctx run.RunContext) error {
 		dryrun = true
 	}
 
-	deployer := deployment.NewGitopsDeployer(&project, &ctx.SecretStore, ctx.DeploymentGenerator, ctx.Logger, dryrun)
-	if err := deployer.Load(); err != nil {
-		return fmt.Errorf("could not load deployer: %w", err)
-	}
-
-	if err := deployer.Deploy(); err != nil {
-		if err == deployment.ErrNoChanges {
+	d := deployer.NewDeployer(&project, ctx.ManifestGenerator, ctx.Logger, dryrun)
+	if err := d.Deploy(); err != nil {
+		if err == deployer.ErrNoChanges {
 			ctx.Logger.Warn("no changes to deploy")
 			return nil
 		}
 
-		return fmt.Errorf("could not deploy project: %w", err)
+		return fmt.Errorf("failed deploying project: %w", err)
 	}
 
 	return nil

diff --git a/cli/cmd/cmds/module/template.go b/cli/cmd/cmds/module/template.go
@@ -17,11 +17,9 @@ func (c *TemplateCmd) Run(ctx run.RunContext) error {
 		return fmt.Errorf("could not load project: %w", err)
 	}
 
-	registry := project.Blueprint.Global.Deployment.Registries.Modules
-	instance := project.Name
 	modules := project.Blueprint.Project.Deployment.Modules
 
-	result, err := ctx.DeploymentGenerator.GenerateBundle(modules, instance, registry)
+	result, err := ctx.DeploymentGenerator.GenerateBundle(modules)
 	if err != nil {
 		return fmt.Errorf("failed to generate manifests: %w", err)
 	}

diff --git a/cli/cmd/main.go b/cli/cmd/main.go
@@ -91,16 +91,18 @@ func Run() int {
 	}
 
 	logger := slog.New(handler)
-	loader := project.NewDefaultProjectLoader(logger)
+	store := secrets.NewDefaultSecretStore()
+	loader := project.NewDefaultProjectLoader(store, logger)
 	gen := generator.NewGenerator(kcl.NewKCLManifestGenerator(logger), logger)
 	runctx := run.RunContext{
 		CI:                  cli.GlobalArgs.CI,
 		DeploymentGenerator: gen,
 		FSWalker:            walker.NewDefaultFSWalker(logger),
 		Local:               cli.GlobalArgs.Local,
 		Logger:              logger,
+		ManifestGenerator:   kcl.NewKCLManifestGenerator(logger),
 		ProjectLoader:       &loader,
-		SecretStore:         secrets.NewDefaultSecretStore(),
+		SecretStore:         store,
 		Verbose:             cli.GlobalArgs.Verbose,
 	}
 	ctx.Bind(runctx)

diff --git a/cli/go.mod b/cli/go.mod
@@ -13,8 +13,6 @@ require (
 	github.com/charmbracelet/bubbletea v1.1.1
 	github.com/charmbracelet/lipgloss v0.13.0
 	github.com/charmbracelet/log v0.4.0
-	github.com/go-git/go-billy/v5 v5.5.0
-	github.com/go-git/go-git/v5 v5.12.0
 	github.com/google/go-github/v66 v66.0.0
 	github.com/input-output-hk/catalyst-forge/lib/project v0.0.0
 	github.com/input-output-hk/catalyst-forge/lib/tools v0.0.0
@@ -91,6 +89,8 @@ require (
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/go-git/go-git/v5 v5.12.0 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect