refactor: moves fetch bundle to deployment (#154)

Author: jmgilman

lib/project/deployment/deployer/deployer.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 
 	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/cuecontext"
 	"github.com/input-output-hk/catalyst-forge/lib/project/deployment"
 	"github.com/input-output-hk/catalyst-forge/lib/project/deployment/generator"
 	"github.com/input-output-hk/catalyst-forge/lib/project/project"
@@ -182,40 +181,6 @@ func (d *Deployer) CreateDeployment(
 	}, nil
 }
 
-// FetchBundle fetches a deployment bundle from the given project and repository.
-func (d *Deployer) FetchBundle(url, ref, projectPath string, opts ...CloneOption) (deployment.ModuleBundle, error) {
-	options := CloneOptions{
-		fs: billy.NewInMemoryFs(),
-	}
-	for _, o := range opts {
-		o(&options)
-	}
-
-	r, err := d.clone(url, ref, options.fs)
-	if err != nil {
-		return deployment.ModuleBundle{}, err
-	}
-
-	exists, err := r.Exists(projectPath)
-	if err != nil {
-		return deployment.ModuleBundle{}, fmt.Errorf("could not check if project path exists: %w", err)
-	} else if !exists {
-		return deployment.ModuleBundle{}, fmt.Errorf("project path does not exist: %s", projectPath)
-	}
-
-	loader := project.NewDefaultProjectLoader(cuecontext.New(), d.ss, d.logger, project.WithFs(r.WorkFs()))
-	p, err := loader.Load("/" + projectPath)
-	if err != nil {
-		return deployment.ModuleBundle{}, fmt.Errorf("could not load project: %w", err)
-	}
-
-	if p.Blueprint.Project == nil || p.Blueprint.Project.Deployment == nil {
-		return deployment.ModuleBundle{}, fmt.Errorf("project does not have a deployment bundle")
-	}
-
-	return deployment.NewModuleBundle(&p), nil
-}
-
 // Commit commits the deployment to the GitOps repository.
 func (d *Deployment) Commit() error {
 	d.logger.Info("Committing changes")

lib/project/deployment/deployer/deployer_test.go

@@ -20,76 +20,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestDeployerFetchBundle(t *testing.T) {
-	tests := []struct {
-		name     string
-		cfg      DeployerConfig
-		files    map[string]string
-		validate func(*testing.T, deployment.ModuleBundle, error)
-	}{
-		{
-			name: "success",
-			cfg:  makeConfig(),
-			files: map[string]string{
-				"project/blueprint.cue": makeBlueprint(),
-			},
-			validate: func(t *testing.T, bundle deployment.ModuleBundle, err error) {
-				require.NoError(t, err)
-
-				b := bundle.Bundle
-				assert.Equal(t, "test", b.Env)
-				assert.Len(t, b.Modules, 1)
-				assert.Equal(t, "module", b.Modules["main"].Name)
-				assert.Equal(t, "v1.0.0", b.Modules["main"].Version)
-			},
-		},
-		{
-			name: "no bundle",
-			cfg:  makeConfig(),
-			files: map[string]string{
-				"project/blueprint.cue": `version: "1.0"`,
-			},
-			validate: func(t *testing.T, bundle deployment.ModuleBundle, err error) {
-				require.Error(t, err)
-				require.Equal(t, "project does not have a deployment bundle", err.Error())
-			},
-		},
-		{
-			name: "no project",
-			cfg:  makeConfig(),
-			files: map[string]string{
-				"project1/blueprint.cue": `version: "1.0"`,
-			},
-			validate: func(t *testing.T, bundle deployment.ModuleBundle, err error) {
-				require.Error(t, err)
-				require.Equal(t, "project path does not exist: project", err.Error())
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fs := billy.NewInMemoryFs()
-
-			remote, _, err := tu.NewMockGitRemoteInterface(tt.files)
-			require.NoError(t, err)
-
-			ss := tu.NewMockSecretStore(map[string]string{"token": "password"})
-			d := Deployer{
-				cfg:    tt.cfg,
-				ctx:    cuecontext.New(),
-				fs:     fs,
-				logger: testutils.NewNoopLogger(),
-				remote: remote,
-				ss:     ss,
-			}
-
-			bundle, err := d.FetchBundle("github.com/org/repo", "main", "project")
-			tt.validate(t, bundle, err)
-		})
-	}
-}
-
 func TestDeployerCreateDeployment(t *testing.T) {
 	type testResult struct {
 		cloneOpts *gg.CloneOptions

lib/project/deployment/module.go

@@ -2,11 +2,15 @@ package deployment
 
 import (
 	"fmt"
+	"log/slog"
 
 	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/format"
 	"github.com/input-output-hk/catalyst-forge/lib/project/project"
+	"github.com/input-output-hk/catalyst-forge/lib/project/secrets"
 	sp "github.com/input-output-hk/catalyst-forge/lib/schema/blueprint/project"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/git/repo"
 )
 
 // ModuleBundle represents a deployment module bundle.
@@ -25,6 +29,28 @@ func (d *ModuleBundle) Dump() ([]byte, error) {
 	return src, nil
 }
 
+// FetchBundle fetches a deployment bundle from the given project and repository.
+func FetchBundle(r repo.GitRepo, projectPath string, store secrets.SecretStore, logger *slog.Logger) (ModuleBundle, error) {
+	exists, err := r.Exists(projectPath)
+	if err != nil {
+		return ModuleBundle{}, fmt.Errorf("could not check if project path exists: %w", err)
+	} else if !exists {
+		return ModuleBundle{}, fmt.Errorf("project path does not exist: %s", projectPath)
+	}
+
+	loader := project.NewDefaultProjectLoader(cuecontext.New(), store, logger, project.WithFs(r.WorkFs()))
+	p, err := loader.Load("/" + projectPath)
+	if err != nil {
+		return ModuleBundle{}, fmt.Errorf("could not load project: %w", err)
+	}
+
+	if p.Blueprint.Project == nil || p.Blueprint.Project.Deployment == nil {
+		return ModuleBundle{}, fmt.Errorf("project does not have a deployment bundle")
+	}
+
+	return NewModuleBundle(&p), nil
+}
+
 // NewModuleBundle creates a new deployment module bundle from a project.
 func NewModuleBundle(p *project.Project) ModuleBundle {
 	bundle := p.Blueprint.Project.Deployment.Bundle