feat: [CDE-142]: provider interface pass pointers. (harness#2232)

* feat: [CDE-142]: provider interface pass pointers.
* feat: [CDE-142]: provider interface pass pointers.
* feat: [CDE-142]: provider interface pass pointers.
* feat: [CDE-142]: provider interface pass pointers.
* feat: [CDE-142]: provider interface pass pointers.
* feat: [CDE-142]: provider interface pass pointers.

Dockerfile

@@ -82,7 +82,6 @@ ENV GITNESS_DATABASE_DATASOURCE /data/database.sqlite
 ENV GITNESS_METRIC_ENABLED=true
 ENV GITNESS_METRIC_ENDPOINT=https://stats.drone.ci/api/v1/gitness
 ENV GITNESS_TOKEN_COOKIE_NAME=token
-ENV GITNESS_GITSPACE_ROOT /data
 ENV GITNESS_DOCKER_HOST unix:///var/run/docker.sock
 
 COPY --from=builder /app/gitness /app/gitness

app/gitspace/infrastructure/provisioner_impl.go

@@ -93,7 +93,7 @@ func (i infraProvisioner) Provision(
 		// TODO: Update the infraProvisioned record
 	}
 
-	return &provisionedInfra, nil
+	return provisionedInfra, nil
 }
 
 func (i infraProvisioner) Stop(
@@ -133,11 +133,11 @@ func (i infraProvisioner) Stop(
 		return nil, fmt.Errorf("invalid provisioning params %+v: %w", infraProviderResource.Metadata, err)
 	}
 
-	var provisionedInfra infraprovider.Infrastructure
+	var provisionedInfra *infraprovider.Infrastructure
 	if infraProvider.ProvisioningType() == enum.InfraProvisioningTypeNew { //nolint:revive
 		// TODO: Fetch and check existing infraProvisioned record
 	} else {
-		provisionedInfra = infraprovider.Infrastructure{
+		provisionedInfra = &infraprovider.Infrastructure{
 			ResourceKey:  gitspaceConfig.Identifier,
 			ProviderType: infraProviderEntity.Type,
 			Parameters:   allParams,
@@ -153,7 +153,7 @@ func (i infraProvisioner) Stop(
 		// TODO: Update existing infraProvisioned record
 	}
 
-	return &stoppedInfra, err
+	return stoppedInfra, err
 }
 
 func (i infraProvisioner) Deprovision(
@@ -193,18 +193,16 @@ func (i infraProvisioner) Deprovision(
 		return nil, fmt.Errorf("invalid provisioning params %+v: %w", infraProviderResource.Metadata, err)
 	}
 
-	var provisionedInfra infraprovider.Infrastructure
+	var provisionedInfra *infraprovider.Infrastructure
 	if infraProvider.ProvisioningType() == enum.InfraProvisioningTypeNew { //nolint:revive
 		// TODO: Fetch and check existing infraProvisioned record
 	} else {
-		provisionedInfra = infraprovider.Infrastructure{
-			ResourceKey:  gitspaceConfig.Identifier,
-			SpacePath:    gitspaceConfig.SpacePath,
-			ProviderType: infraProviderEntity.Type,
-			Parameters:   allParams,
+		provisionedInfra, err = infraProvider.Find(ctx, gitspaceConfig.SpacePath, gitspaceConfig.Identifier, allParams)
+		if err != nil {
+			return nil, fmt.Errorf("unable to find provisioned infra for gitspace %s: %w",
+				gitspaceConfig.Identifier, err)
 		}
 	}
-
 	destroyedInfra, err := infraProvider.Deprovision(ctx, provisionedInfra)
 	if err != nil {
 		return nil, fmt.Errorf("unable to stop provisioned infra %+v: %w", provisionedInfra, err)
@@ -214,7 +212,7 @@ func (i infraProvisioner) Deprovision(
 		// TODO: Update existing infraProvisioned record
 	}
 
-	return &destroyedInfra, err
+	return destroyedInfra, err
 }
 
 func (i infraProvisioner) Find(

app/gitspace/orchestrator/container/embedded_docker.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"path/filepath"
 	"strings"
 
 	"github.com/harness/gitness/app/gitspace/logutil"
@@ -46,7 +45,6 @@ const (
 	containerStateRemoved  = "removed"
 	templateCloneGit       = "clone_git.sh"
 	templateSetupSSHServer = "setup_ssh_server.sh"
-	gitspacesDir           = "gitspaces"
 )
 
 type Config struct {
@@ -159,6 +157,7 @@ func (e *EmbeddedDockerOrchestrator) StartGitspace(
 			dockerClient,
 			ideService,
 			logStreamInstance,
+			infra.Storage,
 		)
 		if startErr != nil {
 			return nil, fmt.Errorf("failed to start gitspace %s: %w", containerName, startErr)
@@ -194,6 +193,7 @@ func (e *EmbeddedDockerOrchestrator) startGitspace(
 	dockerClient *client.Client,
 	ideService IDE,
 	logStreamInstance *logutil.LogStreamInstance,
+	volumeName string,
 ) error {
 	var imageName = devcontainerConfig.Image
 	if imageName == "" {
@@ -205,7 +205,15 @@ func (e *EmbeddedDockerOrchestrator) startGitspace(
 		return err
 	}
 
-	err = e.createContainer(ctx, gitspaceConfig, dockerClient, imageName, containerName, ideService, logStreamInstance)
+	err = e.createContainer(
+		ctx,
+		dockerClient,
+		imageName,
+		containerName,
+		ideService,
+		logStreamInstance,
+		volumeName,
+	)
 	if err != nil {
 		return err
 	}
@@ -411,12 +419,12 @@ func (e *EmbeddedDockerOrchestrator) executePostCreateCommand(
 
 func (e *EmbeddedDockerOrchestrator) createContainer(
 	ctx context.Context,
-	gitspaceConfig *types.GitspaceConfig,
 	dockerClient *client.Client,
 	imageName string,
 	containerName string,
 	ideService IDE,
 	logStreamInstance *logutil.LogStreamInstance,
+	volumeName string,
 ) error {
 	portUsedByIDE := ideService.PortAndProtocol()
 
@@ -442,14 +450,6 @@ func (e *EmbeddedDockerOrchestrator) createContainer(
 	commands := make(strslice.StrSlice, 0)
 	commands = append(commands, "infinity")
 
-	mountSource :=
-		filepath.Join(
-			e.config.RootSource,
-			gitspacesDir,
-			gitspaceConfig.SpacePath,
-			gitspaceConfig.Identifier,
-		)
-
 	loggingErr := logStreamInstance.Write("Creating container: " + containerName)
 	if loggingErr != nil {
 		return fmt.Errorf("logging error: %w", loggingErr)
@@ -464,8 +464,8 @@ func (e *EmbeddedDockerOrchestrator) createContainer(
 		PortBindings: portBindings,
 		Mounts: []mount.Mount{
 			{
-				Type:   mount.TypeBind,
-				Source: mountSource,
+				Type:   mount.TypeVolume,
+				Source: volumeName,
 				Target: e.config.WorkingDirectory,
 			},
 		},

cli/operations/server/config.go

@@ -405,18 +405,10 @@ func ProvideIDEVSCodeWebConfig(config *types.Config) *container.VSCodeWebConfig
 }
 
 // ProvideGitspaceContainerOrchestratorConfig loads the Gitspace container orchestrator config from the main config.
-func ProvideGitspaceContainerOrchestratorConfig(
-	config *types.Config,
-	dockerProviderConfig *infraprovider.DockerProviderConfig,
-) *container.Config {
-	if config.Gitspace.RootSource == "" {
-		config.Gitspace.RootSource = dockerProviderConfig.MountSourceBasePath
-	}
-
+func ProvideGitspaceContainerOrchestratorConfig(config *types.Config) *container.Config {
 	return &container.Config{
 		DefaultBaseImage: config.Gitspace.DefaultBaseImage,
 		WorkingDirectory: config.Gitspace.WorkingDirectory,
-		RootSource:       config.Gitspace.RootSource,
 	}
 }
 
@@ -428,21 +420,3 @@ func ProvideGitspaceEventConfig(config *types.Config) gitspaceevent.Config {
 		MaxRetries:      config.Gitspace.Events.MaxRetries,
 	}
 }
-
-// ProvideDockerProviderConfig loads the Docker provider config from the main config.
-func ProvideDockerProviderConfig(config *types.Config) (*infraprovider.DockerProviderConfig, error) {
-	if config.Gitspace.Root == "" {
-		var homedir string
-
-		homedir, err := os.UserHomeDir()
-		if err != nil {
-			return nil, fmt.Errorf("unable to determine home directory: %w", err)
-		}
-
-		config.Gitspace.Root = filepath.Join(homedir, gitnessHomeDir)
-	}
-
-	return &infraprovider.DockerProviderConfig{
-		MountSourceBasePath: config.Gitspace.Root,
-	}, nil
-}

cmd/gitness/wire.go

@@ -225,7 +225,6 @@ func initSystem(ctx context.Context, config *types.Config) (*cliserver.System, e
 		cliserver.ProvideGitspaceContainerOrchestratorConfig,
 		cliserver.ProvideGitspaceEventConfig,
 		logutil.WireSet,
-		cliserver.ProvideDockerProviderConfig,
 	)
 	return &cliserver.System{}, nil
 }