Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/build_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/di"
)

Expand All @@ -28,11 +28,11 @@ Examples:
RunE: func(cmd *cobra.Command, args []string) error {
injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/build_id_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/windsorcli/cli/pkg/di"
"github.com/windsorcli/cli/pkg/context/shell"
"github.com/windsorcli/cli/pkg/runtime/shell"
)

func TestBuildIDCmd(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/composer"
"github.com/windsorcli/cli/pkg/composer/artifact"
"github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/di"
)

Expand Down Expand Up @@ -35,17 +35,17 @@ Examples:
RunE: func(cmd *cobra.Command, args []string) error {
injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}

composerCtx := &composer.ComposerExecutionContext{
ExecutionContext: *execCtx,
composerCtx := &composer.ComposerRuntime{
Runtime: *execCtx,
}

if existingArtifactBuilder := injector.Resolve("artifactBuilder"); existingArtifactBuilder != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/bundle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"

"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/context/config"
"github.com/windsorcli/cli/pkg/context/shell"
"github.com/windsorcli/cli/pkg/runtime/config"
"github.com/windsorcli/cli/pkg/runtime/shell"
"github.com/windsorcli/cli/pkg/di"
"github.com/windsorcli/cli/pkg/provisioner/kubernetes"
"github.com/windsorcli/cli/pkg/composer/artifact"
Expand Down
14 changes: 7 additions & 7 deletions cmd/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/constants"
"github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/di"
"github.com/windsorcli/cli/pkg/provisioner"
)
Expand All @@ -27,11 +27,11 @@ var checkCmd = &cobra.Command{
RunE: func(cmd *cobra.Command, args []string) error {
injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand Down Expand Up @@ -72,11 +72,11 @@ var checkNodeHealthCmd = &cobra.Command{
nodeHealthTimeout = constants.DefaultNodeHealthCheckTimeout
}

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand All @@ -93,8 +93,8 @@ var checkNodeHealthCmd = &cobra.Command{
return fmt.Errorf("Nothing to check. Have you run \033[1mwindsor init\033[0m?")
}

provisionerCtx := &provisioner.ProvisionerExecutionContext{
ExecutionContext: *execCtx,
provisionerCtx := &provisioner.ProvisionerRuntime{
Runtime: *execCtx,
}

prov := provisioner.NewProvisioner(provisionerCtx)
Expand Down
14 changes: 7 additions & 7 deletions cmd/check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"testing"

"github.com/windsorcli/cli/pkg/context/config"
"github.com/windsorcli/cli/pkg/context/shell"
"github.com/windsorcli/cli/pkg/context/tools"
"github.com/windsorcli/cli/pkg/runtime/config"
"github.com/windsorcli/cli/pkg/runtime/shell"
"github.com/windsorcli/cli/pkg/runtime/tools"
"github.com/windsorcli/cli/pkg/di"
"github.com/windsorcli/cli/pkg/provisioner/cluster"
)
Expand Down Expand Up @@ -156,7 +156,7 @@ func TestCheckCmd_ErrorScenarios(t *testing.T) {
return stdout, stderr
}

t.Run("HandlesNewContextError", func(t *testing.T) {
t.Run("HandlesNewRuntimeError", func(t *testing.T) {
setup(t)
injector := di.NewInjector()
mockShell := shell.NewMockShell()
Expand All @@ -176,7 +176,7 @@ func TestCheckCmd_ErrorScenarios(t *testing.T) {
err := Execute()

if err == nil {
t.Error("Expected error when NewContext fails")
t.Error("Expected error when NewRuntime fails")
}

if !strings.Contains(err.Error(), "failed to initialize context") {
Expand Down Expand Up @@ -474,7 +474,7 @@ func TestCheckNodeHealthCmd_ErrorScenarios(t *testing.T) {
return stdout, stderr
}

t.Run("HandlesNewContextError", func(t *testing.T) {
t.Run("HandlesNewRuntimeError", func(t *testing.T) {
setup(t)
injector := di.NewInjector()
mockShell := shell.NewMockShell()
Expand All @@ -494,7 +494,7 @@ func TestCheckNodeHealthCmd_ErrorScenarios(t *testing.T) {
err := Execute()

if err == nil {
t.Error("Expected error when NewContext fails")
t.Error("Expected error when NewRuntime fails")
}

if !strings.Contains(err.Error(), "failed to initialize context") {
Expand Down
10 changes: 5 additions & 5 deletions cmd/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/di"
)

Expand All @@ -17,11 +17,11 @@ var getContextCmd = &cobra.Command{
RunE: func(cmd *cobra.Command, args []string) error {
injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand All @@ -47,11 +47,11 @@ var setContextCmd = &cobra.Command{
RunE: func(cmd *cobra.Command, args []string) error {
injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"testing"

"github.com/windsorcli/cli/pkg/context/config"
"github.com/windsorcli/cli/pkg/context/shell"
"github.com/windsorcli/cli/pkg/runtime/config"
"github.com/windsorcli/cli/pkg/runtime/shell"
"github.com/windsorcli/cli/pkg/di"
)

Expand Down Expand Up @@ -189,7 +189,7 @@ func TestContextCmd_ErrorScenarios(t *testing.T) {
return stdout, stderr
}

t.Run("GetContext_HandlesNewContextError", func(t *testing.T) {
t.Run("GetContext_HandlesNewRuntimeError", func(t *testing.T) {
setup(t)
injector := di.NewInjector()
mockShell := shell.NewMockShell()
Expand All @@ -208,7 +208,7 @@ func TestContextCmd_ErrorScenarios(t *testing.T) {
err := Execute()

if err == nil {
t.Error("Expected error when NewContext fails")
t.Error("Expected error when NewRuntime fails")
}

if !strings.Contains(err.Error(), "failed to initialize context") {
Expand Down Expand Up @@ -256,7 +256,7 @@ func TestContextCmd_ErrorScenarios(t *testing.T) {
}
})

t.Run("SetContext_HandlesNewContextError", func(t *testing.T) {
t.Run("SetContext_HandlesNewRuntimeError", func(t *testing.T) {
setup(t)
injector := di.NewInjector()
mockShell := shell.NewMockShell()
Expand All @@ -275,7 +275,7 @@ func TestContextCmd_ErrorScenarios(t *testing.T) {
err := Execute()

if err == nil {
t.Error("Expected error when NewContext fails")
t.Error("Expected error when NewRuntime fails")
}

if !strings.Contains(err.Error(), "failed to initialize context") {
Expand Down
16 changes: 8 additions & 8 deletions cmd/down_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
blueprintv1alpha1 "github.com/windsorcli/cli/api/v1alpha1"
"github.com/windsorcli/cli/pkg/composer"
"github.com/windsorcli/cli/pkg/composer/blueprint"
"github.com/windsorcli/cli/pkg/context/config"
execcontext "github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime/config"
execcontext "github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/provisioner"
terraforminfra "github.com/windsorcli/cli/pkg/provisioner/terraform"
"github.com/windsorcli/cli/pkg/workstation"
Expand Down Expand Up @@ -284,16 +284,16 @@ func setupDownMocksWithProject(t *testing.T) (*Mocks, *provisioner.Provisioner,
t.Fatal("executionContext not found in injector")
}

prov := provisioner.NewProvisioner(&provisioner.ProvisionerExecutionContext{
ExecutionContext: *mockExecCtx.(*execcontext.ExecutionContext),
prov := provisioner.NewProvisioner(&provisioner.ProvisionerRuntime{
Runtime: *mockExecCtx.(*execcontext.Runtime),
})

comp := composer.NewComposer(&composer.ComposerExecutionContext{
ExecutionContext: *mockExecCtx.(*execcontext.ExecutionContext),
comp := composer.NewComposer(&composer.ComposerRuntime{
Runtime: *mockExecCtx.(*execcontext.Runtime),
})

ws, err := workstation.NewWorkstation(&workstation.WorkstationExecutionContext{
ExecutionContext: *mockExecCtx.(*execcontext.ExecutionContext),
ws, err := workstation.NewWorkstation(&workstation.WorkstationRuntime{
Runtime: *mockExecCtx.(*execcontext.Runtime),
}, mocks.Injector)
if err != nil {
t.Fatalf("Failed to create workstation: %v", err)
Expand Down
6 changes: 3 additions & 3 deletions cmd/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/di"
)

Expand All @@ -27,11 +27,11 @@ var envCmd = &cobra.Command{

injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/env_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"testing"

"github.com/windsorcli/cli/pkg/context/config"
"github.com/windsorcli/cli/pkg/context/env"
"github.com/windsorcli/cli/pkg/context/shell"
"github.com/windsorcli/cli/pkg/runtime/config"
"github.com/windsorcli/cli/pkg/runtime/env"
"github.com/windsorcli/cli/pkg/runtime/shell"
"github.com/windsorcli/cli/pkg/di"
)

Expand Down Expand Up @@ -231,7 +231,7 @@ func TestEnvCmd_ErrorScenarios(t *testing.T) {
// so testing the Setenv error path isn't realistic. The error handling code exists
// for completeness but cannot be triggered in practice.

t.Run("HandlesNewContextError", func(t *testing.T) {
t.Run("HandlesNewRuntimeError", func(t *testing.T) {
setup(t)
// Reset context and verbose before setting up test
rootCmd.SetContext(context.Background())
Expand All @@ -257,7 +257,7 @@ func TestEnvCmd_ErrorScenarios(t *testing.T) {
err := Execute()

if err == nil {
t.Error("Expected error when NewContext fails")
t.Error("Expected error when NewRuntime fails")
}

if !strings.Contains(err.Error(), "failed to initialize context") {
Expand Down Expand Up @@ -399,7 +399,7 @@ func TestEnvCmd_ErrorScenarios(t *testing.T) {
return fmt.Errorf("hook failed")
}
// Override the WindsorEnv printer after LoadEnvironment has initialized it
// We need to set it directly on the ExecutionContext after it's created
// We need to set it directly on the Runtime after it's created
injector := mocks.Injector

ctx := context.WithValue(context.Background(), injectorKey, injector)
Expand Down
6 changes: 3 additions & 3 deletions cmd/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/windsorcli/cli/pkg/context"
"github.com/windsorcli/cli/pkg/runtime"
"github.com/windsorcli/cli/pkg/di"
)

Expand All @@ -25,11 +25,11 @@ var execCmd = &cobra.Command{

injector := cmd.Context().Value(injectorKey).(di.Injector)

execCtx := &context.ExecutionContext{
execCtx := &runtime.Runtime{
Injector: injector,
}

execCtx, err := context.NewContext(execCtx)
execCtx, err := runtime.NewRuntime(execCtx)
if err != nil {
return fmt.Errorf("failed to initialize context: %w", err)
}
Expand Down
Loading
Loading