From 00b82a885d7f80fa0d0060760ec70aab17dc9dac Mon Sep 17 00:00:00 2001 From: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com> Date: Sun, 26 Oct 2025 15:12:56 -0400 Subject: [PATCH 1/3] refactor(shell): Move the ssh functionality underneath the shell package SSH is exclusively used to implement the secure shell option in the "shell" package. Moves it in as part of the same package. Signed-off-by: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com> --- pkg/shell/secure_shell.go | 2 +- pkg/shell/secure_shell_test.go | 2 +- pkg/{workstation => shell}/ssh/client.go | 0 pkg/{workstation => shell}/ssh/client_test.go | 0 pkg/{workstation => shell}/ssh/mock_client.go | 0 pkg/{workstation => shell}/ssh/mock_client_test.go | 0 pkg/{workstation => shell}/ssh/real_client.go | 0 pkg/{workstation => shell}/ssh/shims.go | 0 pkg/workstation/network/colima_network.go | 2 +- pkg/workstation/network/network.go | 2 +- pkg/workstation/network/network_test.go | 2 +- 11 files changed, 5 insertions(+), 5 deletions(-) rename pkg/{workstation => shell}/ssh/client.go (100%) rename pkg/{workstation => shell}/ssh/client_test.go (100%) rename pkg/{workstation => shell}/ssh/mock_client.go (100%) rename pkg/{workstation => shell}/ssh/mock_client_test.go (100%) rename pkg/{workstation => shell}/ssh/real_client.go (100%) rename pkg/{workstation => shell}/ssh/shims.go (100%) diff --git a/pkg/shell/secure_shell.go b/pkg/shell/secure_shell.go index 6d6076dcd..bbd73e638 100644 --- a/pkg/shell/secure_shell.go +++ b/pkg/shell/secure_shell.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/workstation/ssh" + "github.com/windsorcli/cli/pkg/shell/ssh" ) // The SecureShell is a secure implementation of the Shell interface using SSH. diff --git a/pkg/shell/secure_shell_test.go b/pkg/shell/secure_shell_test.go index 8c7b7e717..69fd74bdd 100644 --- a/pkg/shell/secure_shell_test.go +++ b/pkg/shell/secure_shell_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/workstation/ssh" + "github.com/windsorcli/cli/pkg/shell/ssh" ) // The SecureShellTest is a test suite for the SecureShell implementation. diff --git a/pkg/workstation/ssh/client.go b/pkg/shell/ssh/client.go similarity index 100% rename from pkg/workstation/ssh/client.go rename to pkg/shell/ssh/client.go diff --git a/pkg/workstation/ssh/client_test.go b/pkg/shell/ssh/client_test.go similarity index 100% rename from pkg/workstation/ssh/client_test.go rename to pkg/shell/ssh/client_test.go diff --git a/pkg/workstation/ssh/mock_client.go b/pkg/shell/ssh/mock_client.go similarity index 100% rename from pkg/workstation/ssh/mock_client.go rename to pkg/shell/ssh/mock_client.go diff --git a/pkg/workstation/ssh/mock_client_test.go b/pkg/shell/ssh/mock_client_test.go similarity index 100% rename from pkg/workstation/ssh/mock_client_test.go rename to pkg/shell/ssh/mock_client_test.go diff --git a/pkg/workstation/ssh/real_client.go b/pkg/shell/ssh/real_client.go similarity index 100% rename from pkg/workstation/ssh/real_client.go rename to pkg/shell/ssh/real_client.go diff --git a/pkg/workstation/ssh/shims.go b/pkg/shell/ssh/shims.go similarity index 100% rename from pkg/workstation/ssh/shims.go rename to pkg/shell/ssh/shims.go diff --git a/pkg/workstation/network/colima_network.go b/pkg/workstation/network/colima_network.go index 655a61913..9f4e9db44 100644 --- a/pkg/workstation/network/colima_network.go +++ b/pkg/workstation/network/colima_network.go @@ -8,7 +8,7 @@ import ( "github.com/windsorcli/cli/pkg/constants" "github.com/windsorcli/cli/pkg/di" "github.com/windsorcli/cli/pkg/shell" - "github.com/windsorcli/cli/pkg/workstation/ssh" + "github.com/windsorcli/cli/pkg/shell/ssh" ) // The ColimaNetworkManager is a specialized network manager for Colima-based environments. diff --git a/pkg/workstation/network/network.go b/pkg/workstation/network/network.go index f3663d640..e1c4a00f6 100644 --- a/pkg/workstation/network/network.go +++ b/pkg/workstation/network/network.go @@ -9,8 +9,8 @@ import ( "github.com/windsorcli/cli/pkg/constants" "github.com/windsorcli/cli/pkg/di" "github.com/windsorcli/cli/pkg/shell" + "github.com/windsorcli/cli/pkg/shell/ssh" "github.com/windsorcli/cli/pkg/workstation/services" - "github.com/windsorcli/cli/pkg/workstation/ssh" ) // The NetworkManager is a core component that manages local development network configuration. diff --git a/pkg/workstation/network/network_test.go b/pkg/workstation/network/network_test.go index caaad6359..d68df51ff 100644 --- a/pkg/workstation/network/network_test.go +++ b/pkg/workstation/network/network_test.go @@ -10,8 +10,8 @@ import ( "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/di" "github.com/windsorcli/cli/pkg/shell" + "github.com/windsorcli/cli/pkg/shell/ssh" "github.com/windsorcli/cli/pkg/workstation/services" - "github.com/windsorcli/cli/pkg/workstation/ssh" ) // ============================================================================= From be9f5ae49ca1273b3018b263fc3bee387b5dc953 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com> Date: Sun, 26 Oct 2025 15:16:47 -0400 Subject: [PATCH 2/3] Change ssh reference Signed-off-by: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com> --- pkg/pipelines/pipeline.go | 2 +- pkg/runtime/runtime.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/pipelines/pipeline.go b/pkg/pipelines/pipeline.go index 3c4141152..b925db04e 100644 --- a/pkg/pipelines/pipeline.go +++ b/pkg/pipelines/pipeline.go @@ -18,12 +18,12 @@ import ( "github.com/windsorcli/cli/pkg/kubernetes" "github.com/windsorcli/cli/pkg/secrets" "github.com/windsorcli/cli/pkg/shell" + "github.com/windsorcli/cli/pkg/shell/ssh" "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/terraform" "github.com/windsorcli/cli/pkg/tools" "github.com/windsorcli/cli/pkg/workstation/network" "github.com/windsorcli/cli/pkg/workstation/services" - "github.com/windsorcli/cli/pkg/workstation/ssh" "github.com/windsorcli/cli/pkg/workstation/virt" ) diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go index 81d796989..61e03ab88 100644 --- a/pkg/runtime/runtime.go +++ b/pkg/runtime/runtime.go @@ -15,6 +15,7 @@ import ( "github.com/windsorcli/cli/pkg/kubernetes" "github.com/windsorcli/cli/pkg/secrets" "github.com/windsorcli/cli/pkg/shell" + "github.com/windsorcli/cli/pkg/shell/ssh" "github.com/windsorcli/cli/pkg/terraform" "github.com/windsorcli/cli/pkg/tools" "github.com/windsorcli/cli/pkg/workstation/network" From 2826c53d6a0e05ab0f29f1adcb5f24040670b6d6 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com> Date: Sun, 26 Oct 2025 15:19:57 -0400 Subject: [PATCH 3/3] Remove unused path Signed-off-by: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com> --- pkg/runtime/runtime.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go index 61e03ab88..454758f11 100644 --- a/pkg/runtime/runtime.go +++ b/pkg/runtime/runtime.go @@ -20,7 +20,6 @@ import ( "github.com/windsorcli/cli/pkg/tools" "github.com/windsorcli/cli/pkg/workstation/network" "github.com/windsorcli/cli/pkg/workstation/services" - "github.com/windsorcli/cli/pkg/workstation/ssh" "github.com/windsorcli/cli/pkg/workstation/virt" )