refactor(composer): Remove dependency injector from composer

cmd/build_id.go

@@ -28,20 +28,20 @@ Examples:
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
 		var buildID string
 		if buildIdNewFlag {
-			buildID, err = execCtx.GenerateBuildID()
+			buildID, err = rt.GenerateBuildID()
 		} else {
-			buildID, err = execCtx.GetBuildID()
+			buildID, err = rt.GetBuildID()
 		}
 		if err != nil {
 			return fmt.Errorf("failed to manage build ID: %w", err)

cmd/bundle.go

@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/windsorcli/cli/pkg/composer"
 	"github.com/windsorcli/cli/pkg/composer/artifact"
-	"github.com/windsorcli/cli/pkg/runtime"
 	"github.com/windsorcli/cli/pkg/di"
+	"github.com/windsorcli/cli/pkg/runtime"
 )
 
 // bundleCmd represents the bundle command
@@ -35,26 +35,25 @@ Examples:
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		composerCtx := &composer.ComposerRuntime{
-			Runtime: *execCtx,
-		}
-
+		var override *composer.Composer
 		if existingArtifactBuilder := injector.Resolve("artifactBuilder"); existingArtifactBuilder != nil {
 			if artifactBuilder, ok := existingArtifactBuilder.(artifact.Artifact); ok {
-				composerCtx.ArtifactBuilder = artifactBuilder
+				override = &composer.Composer{
+					ArtifactBuilder: artifactBuilder,
+				}
 			}
 		}
 
-		comp := composer.NewComposer(composerCtx)
+		comp := composer.NewComposer(rt, override)
 
 		tag, _ := cmd.Flags().GetString("tag")
 		outputPath, _ := cmd.Flags().GetString("output")

cmd/check.go

@@ -27,28 +27,28 @@ var checkCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.Shell.CheckTrustedDirectory(); err != nil {
+		if err := rt.Shell.CheckTrustedDirectory(); err != nil {
 			return fmt.Errorf("not in a trusted directory. If you are in a Windsor project, run 'windsor init' to approve")
 		}
 
-		if err := execCtx.ConfigHandler.LoadConfig(); err != nil {
+		if err := rt.ConfigHandler.LoadConfig(); err != nil {
 			return err
 		}
 
-		if !execCtx.ConfigHandler.IsLoaded() {
+		if !rt.ConfigHandler.IsLoaded() {
 			return fmt.Errorf("Nothing to check. Have you run \033[1mwindsor init\033[0m?")
 		}
 
-		if err := execCtx.CheckTools(); err != nil {
+		if err := rt.CheckTools(); err != nil {
 			return err
 		}
 
@@ -72,29 +72,29 @@ var checkNodeHealthCmd = &cobra.Command{
 			nodeHealthTimeout = constants.DefaultNodeHealthCheckTimeout
 		}
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.Shell.CheckTrustedDirectory(); err != nil {
+		if err := rt.Shell.CheckTrustedDirectory(); err != nil {
 			return fmt.Errorf("not in a trusted directory. If you are in a Windsor project, run 'windsor init' to approve")
 		}
 
-		if err := execCtx.ConfigHandler.LoadConfig(); err != nil {
+		if err := rt.ConfigHandler.LoadConfig(); err != nil {
 			return err
 		}
 
-		if !execCtx.ConfigHandler.IsLoaded() {
+		if !rt.ConfigHandler.IsLoaded() {
 			return fmt.Errorf("Nothing to check. Have you run \033[1mwindsor init\033[0m?")
 		}
 
 		provisionerCtx := &provisioner.ProvisionerRuntime{
-			Runtime: *execCtx,
+			Runtime: *rt,
 		}
 
 		prov := provisioner.NewProvisioner(provisionerCtx)

cmd/context.go

@@ -17,20 +17,20 @@ var getContextCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.ConfigHandler.LoadConfig(); err != nil {
+		if err := rt.ConfigHandler.LoadConfig(); err != nil {
 			return fmt.Errorf("failed to load config: %w", err)
 		}
 
-		contextName := execCtx.ConfigHandler.GetContext()
+		contextName := rt.ConfigHandler.GetContext()
 		fmt.Fprintln(cmd.OutOrStdout(), contextName)
 
 		return nil
@@ -47,24 +47,24 @@ var setContextCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.ConfigHandler.LoadConfig(); err != nil {
+		if err := rt.ConfigHandler.LoadConfig(); err != nil {
 			return fmt.Errorf("failed to load config: %w", err)
 		}
 
-		if _, err := execCtx.Shell.WriteResetToken(); err != nil {
+		if _, err := rt.Shell.WriteResetToken(); err != nil {
 			return fmt.Errorf("failed to write reset token: %w", err)
 		}
 
-		if err := execCtx.ConfigHandler.SetContext(args[0]); err != nil {
+		if err := rt.ConfigHandler.SetContext(args[0]); err != nil {
 			return fmt.Errorf("failed to set context: %w", err)
 		}
 

cmd/down.go

@@ -29,7 +29,7 @@ var downCmd = &cobra.Command{
 			return err
 		}
 
-		if err := proj.Context.Shell.CheckTrustedDirectory(); err != nil {
+		if err := proj.Runtime.Shell.CheckTrustedDirectory(); err != nil {
 			return fmt.Errorf("not in a trusted directory. If you are in a Windsor project, run 'windsor init' to approve")
 		}
 

cmd/env.go

@@ -27,28 +27,28 @@ var envCmd = &cobra.Command{
 
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.Shell.CheckTrustedDirectory(); err != nil {
+		if err := rt.Shell.CheckTrustedDirectory(); err != nil {
 			return fmt.Errorf("not in a trusted directory. If you are in a Windsor project, run 'windsor init' to approve")
 		}
 
-		if err := execCtx.HandleSessionReset(); err != nil {
+		if err := rt.HandleSessionReset(); err != nil {
 			return err
 		}
 
-		if err := execCtx.ConfigHandler.LoadConfig(); err != nil {
+		if err := rt.ConfigHandler.LoadConfig(); err != nil {
 			return err
 		}
 
-		if err := execCtx.LoadEnvironment(decrypt); err != nil {
+		if err := rt.LoadEnvironment(decrypt); err != nil {
 			if hook || !verbose {
 				return nil
 			}
@@ -62,15 +62,15 @@ var envCmd = &cobra.Command{
 		}
 
 		if hook {
-			if execCtx.Shell != nil && len(execCtx.GetEnvVars()) > 0 {
-				outputFunc(execCtx.Shell.RenderEnvVars(execCtx.GetEnvVars(), true))
+			if rt.Shell != nil && len(rt.GetEnvVars()) > 0 {
+				outputFunc(rt.Shell.RenderEnvVars(rt.GetEnvVars(), true))
 			}
-			if execCtx.Shell != nil && len(execCtx.GetAliases()) > 0 {
-				outputFunc(execCtx.Shell.RenderAliases(execCtx.GetAliases()))
+			if rt.Shell != nil && len(rt.GetAliases()) > 0 {
+				outputFunc(rt.Shell.RenderAliases(rt.GetAliases()))
 			}
 		} else {
-			if execCtx.Shell != nil && len(execCtx.GetEnvVars()) > 0 {
-				outputFunc(execCtx.Shell.RenderEnvVars(execCtx.GetEnvVars(), false))
+			if rt.Shell != nil && len(rt.GetEnvVars()) > 0 {
+				outputFunc(rt.Shell.RenderEnvVars(rt.GetEnvVars(), false))
 			}
 		}
 

cmd/exec.go

@@ -25,35 +25,35 @@ var execCmd = &cobra.Command{
 
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.Shell.CheckTrustedDirectory(); err != nil {
+		if err := rt.Shell.CheckTrustedDirectory(); err != nil {
 			return fmt.Errorf("not in a trusted directory. If you are in a Windsor project, run 'windsor init' to approve")
 		}
 
-		if err := execCtx.HandleSessionReset(); err != nil {
+		if err := rt.HandleSessionReset(); err != nil {
 			return err
 		}
 
-		if err := execCtx.ConfigHandler.LoadConfig(); err != nil {
+		if err := rt.ConfigHandler.LoadConfig(); err != nil {
 			return err
 		}
 
-		if err := execCtx.LoadEnvironment(true); err != nil {
+		if err := rt.LoadEnvironment(true); err != nil {
 			if !verbose {
 				return nil
 			}
 			return fmt.Errorf("failed to load environment: %w", err)
 		}
 
-		for key, value := range execCtx.GetEnvVars() {
+		for key, value := range rt.GetEnvVars() {
 			if err := os.Setenv(key, value); err != nil {
 				return fmt.Errorf("failed to set environment variable %s: %w", key, err)
 			}
@@ -65,7 +65,7 @@ var execCmd = &cobra.Command{
 			commandArgs = args[1:]
 		}
 
-		if _, err := execCtx.Shell.Exec(command, commandArgs...); err != nil {
+		if _, err := rt.Shell.Exec(command, commandArgs...); err != nil {
 			return fmt.Errorf("failed to execute command: %w", err)
 		}
 

cmd/hook.go

@@ -17,16 +17,16 @@ var hookCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		execCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		execCtx, err := runtime.NewRuntime(execCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := execCtx.Shell.InstallHook(args[0]); err != nil {
+		if err := rt.Shell.InstallHook(args[0]); err != nil {
 			return fmt.Errorf("error installing hook: %w", err)
 		}
 

cmd/init.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/windsorcli/cli/pkg/runtime"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/project"
+	"github.com/windsorcli/cli/pkg/runtime"
 )
 
 // =============================================================================
@@ -43,24 +43,24 @@ var initCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		injector := cmd.Context().Value(injectorKey).(di.Injector)
 
-		baseCtx := &runtime.Runtime{
+		rt := &runtime.Runtime{
 			Injector: injector,
 		}
 
-		baseCtx, err := runtime.NewRuntime(baseCtx)
+		rt, err := runtime.NewRuntime(rt)
 		if err != nil {
 			return fmt.Errorf("failed to initialize context: %w", err)
 		}
 
-		if err := baseCtx.Shell.AddCurrentDirToTrustedFile(); err != nil {
+		if err := rt.Shell.AddCurrentDirToTrustedFile(); err != nil {
 			return fmt.Errorf("failed to add current directory to trusted file: %w", err)
 		}
 
 		contextName := "local"
 		if len(args) > 0 {
 			contextName = args[0]
 		} else {
-			currentContext := baseCtx.ConfigHandler.GetContext()
+			currentContext := rt.ConfigHandler.GetContext()
 			if currentContext != "" && currentContext != "local" {
 				contextName = currentContext
 			}
@@ -114,7 +114,7 @@ var initCmd = &cobra.Command{
 			}
 		}
 
-		proj, err := project.NewProject(injector, contextName, baseCtx)
+		proj, err := project.NewProject(injector, contextName, rt)
 		if err != nil {
 			return err
 		}
@@ -131,7 +131,7 @@ var initCmd = &cobra.Command{
 		}
 
 		hasSetFlags := len(initSetFlags) > 0
-		if err := proj.Context.ConfigHandler.SaveConfig(hasSetFlags); err != nil {
+		if err := proj.Runtime.ConfigHandler.SaveConfig(hasSetFlags); err != nil {
 			return fmt.Errorf("failed to save configuration: %w", err)
 		}
 

cmd/install.go

@@ -22,7 +22,7 @@ var installCmd = &cobra.Command{
 			return err
 		}
 
-		if err := proj.Context.Shell.CheckTrustedDirectory(); err != nil {
+		if err := proj.Runtime.Shell.CheckTrustedDirectory(); err != nil {
 			return fmt.Errorf("not in a trusted directory. If you are in a Windsor project, run 'windsor init' to approve")
 		}