diff --git a/pkg/pipelines/down.go b/pkg/pipelines/down.go index 25b0bc046..0fd963513 100644 --- a/pkg/pipelines/down.go +++ b/pkg/pipelines/down.go @@ -10,10 +10,10 @@ import ( "github.com/windsorcli/cli/pkg/di" "github.com/windsorcli/cli/pkg/env" "github.com/windsorcli/cli/pkg/kubernetes" - "github.com/windsorcli/cli/pkg/network" "github.com/windsorcli/cli/pkg/shell" "github.com/windsorcli/cli/pkg/stack" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/network" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // The DownPipeline is a specialized component that manages the infrastructure teardown phase diff --git a/pkg/pipelines/down_test.go b/pkg/pipelines/down_test.go index 20ab391d0..d7b06f164 100644 --- a/pkg/pipelines/down_test.go +++ b/pkg/pipelines/down_test.go @@ -11,10 +11,10 @@ import ( "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/env" "github.com/windsorcli/cli/pkg/kubernetes" - "github.com/windsorcli/cli/pkg/network" "github.com/windsorcli/cli/pkg/shell" "github.com/windsorcli/cli/pkg/stack" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/network" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // ============================================================================= diff --git a/pkg/pipelines/init.go b/pkg/pipelines/init.go index 434e0836a..fcc7c4d7a 100644 --- a/pkg/pipelines/init.go +++ b/pkg/pipelines/init.go @@ -15,14 +15,14 @@ import ( "github.com/windsorcli/cli/pkg/di" "github.com/windsorcli/cli/pkg/env" "github.com/windsorcli/cli/pkg/generators" - "github.com/windsorcli/cli/pkg/network" - "github.com/windsorcli/cli/pkg/services" "github.com/windsorcli/cli/pkg/shell" "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/template" "github.com/windsorcli/cli/pkg/terraform" "github.com/windsorcli/cli/pkg/tools" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/network" + "github.com/windsorcli/cli/pkg/workstation/services" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // The InitPipeline is a specialized component that manages application initialization functionality. diff --git a/pkg/pipelines/init_test.go b/pkg/pipelines/init_test.go index 3a3055323..bff32871c 100644 --- a/pkg/pipelines/init_test.go +++ b/pkg/pipelines/init_test.go @@ -17,7 +17,7 @@ import ( "github.com/windsorcli/cli/pkg/shell" "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/tools" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // ============================================================================= diff --git a/pkg/pipelines/pipeline.go b/pkg/pipelines/pipeline.go index f883d9be5..32ce14697 100644 --- a/pkg/pipelines/pipeline.go +++ b/pkg/pipelines/pipeline.go @@ -16,16 +16,16 @@ import ( envpkg "github.com/windsorcli/cli/pkg/env" "github.com/windsorcli/cli/pkg/generators" "github.com/windsorcli/cli/pkg/kubernetes" - "github.com/windsorcli/cli/pkg/network" "github.com/windsorcli/cli/pkg/secrets" - "github.com/windsorcli/cli/pkg/services" "github.com/windsorcli/cli/pkg/shell" - "github.com/windsorcli/cli/pkg/ssh" "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/template" "github.com/windsorcli/cli/pkg/terraform" "github.com/windsorcli/cli/pkg/tools" - "github.com/windsorcli/cli/pkg/virt" + "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" ) // The BasePipeline is a foundational component that provides common pipeline functionality for command execution. diff --git a/pkg/pipelines/pipeline_test.go b/pkg/pipelines/pipeline_test.go index aeb27c118..1938a52ef 100644 --- a/pkg/pipelines/pipeline_test.go +++ b/pkg/pipelines/pipeline_test.go @@ -23,7 +23,7 @@ import ( "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/template" "github.com/windsorcli/cli/pkg/tools" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // ============================================================================= diff --git a/pkg/pipelines/up.go b/pkg/pipelines/up.go index f272b2437..aea44f891 100644 --- a/pkg/pipelines/up.go +++ b/pkg/pipelines/up.go @@ -7,11 +7,11 @@ import ( "github.com/windsorcli/cli/pkg/di" "github.com/windsorcli/cli/pkg/env" - "github.com/windsorcli/cli/pkg/network" "github.com/windsorcli/cli/pkg/shell" "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/tools" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/network" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // The UpPipeline is a specialized component that manages the infrastructure deployment phase diff --git a/pkg/pipelines/up_test.go b/pkg/pipelines/up_test.go index 5ee33a05a..0cda78dfd 100644 --- a/pkg/pipelines/up_test.go +++ b/pkg/pipelines/up_test.go @@ -7,11 +7,11 @@ import ( "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/env" - "github.com/windsorcli/cli/pkg/network" "github.com/windsorcli/cli/pkg/shell" "github.com/windsorcli/cli/pkg/stack" "github.com/windsorcli/cli/pkg/tools" - "github.com/windsorcli/cli/pkg/virt" + "github.com/windsorcli/cli/pkg/workstation/network" + "github.com/windsorcli/cli/pkg/workstation/virt" ) // ============================================================================= diff --git a/pkg/shell/secure_shell.go b/pkg/shell/secure_shell.go index 4f41c2d52..6d6076dcd 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/ssh" + "github.com/windsorcli/cli/pkg/workstation/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 a82ef9e3a..8c7b7e717 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/ssh" + "github.com/windsorcli/cli/pkg/workstation/ssh" ) // The SecureShellTest is a test suite for the SecureShell implementation. diff --git a/pkg/network/colima_network.go b/pkg/workstation/network/colima_network.go similarity index 99% rename from pkg/network/colima_network.go rename to pkg/workstation/network/colima_network.go index b791c98d2..4e2c4f00a 100644 --- a/pkg/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/ssh" + "github.com/windsorcli/cli/pkg/workstation/ssh" ) // The ColimaNetworkManager is a specialized network manager for Colima-based environments. diff --git a/pkg/network/colima_network_test.go b/pkg/workstation/network/colima_network_test.go similarity index 100% rename from pkg/network/colima_network_test.go rename to pkg/workstation/network/colima_network_test.go diff --git a/pkg/network/darwin_network.go b/pkg/workstation/network/darwin_network.go similarity index 100% rename from pkg/network/darwin_network.go rename to pkg/workstation/network/darwin_network.go diff --git a/pkg/network/darwin_network_test.go b/pkg/workstation/network/darwin_network_test.go similarity index 100% rename from pkg/network/darwin_network_test.go rename to pkg/workstation/network/darwin_network_test.go diff --git a/pkg/network/linux_network.go b/pkg/workstation/network/linux_network.go similarity index 100% rename from pkg/network/linux_network.go rename to pkg/workstation/network/linux_network.go diff --git a/pkg/network/linux_network_test.go b/pkg/workstation/network/linux_network_test.go similarity index 100% rename from pkg/network/linux_network_test.go rename to pkg/workstation/network/linux_network_test.go diff --git a/pkg/network/mock_network.go b/pkg/workstation/network/mock_network.go similarity index 100% rename from pkg/network/mock_network.go rename to pkg/workstation/network/mock_network.go diff --git a/pkg/network/mock_network_test.go b/pkg/workstation/network/mock_network_test.go similarity index 100% rename from pkg/network/mock_network_test.go rename to pkg/workstation/network/mock_network_test.go diff --git a/pkg/network/network.go b/pkg/workstation/network/network.go similarity index 98% rename from pkg/network/network.go rename to pkg/workstation/network/network.go index 4fd7b8560..eb94a1a14 100644 --- a/pkg/network/network.go +++ b/pkg/workstation/network/network.go @@ -8,9 +8,9 @@ import ( "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/constants" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/services" "github.com/windsorcli/cli/pkg/shell" - "github.com/windsorcli/cli/pkg/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/network/network_test.go b/pkg/workstation/network/network_test.go similarity index 99% rename from pkg/network/network_test.go rename to pkg/workstation/network/network_test.go index 279d415e5..caaad6359 100644 --- a/pkg/network/network_test.go +++ b/pkg/workstation/network/network_test.go @@ -9,9 +9,9 @@ import ( "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/services" "github.com/windsorcli/cli/pkg/shell" - "github.com/windsorcli/cli/pkg/ssh" + "github.com/windsorcli/cli/pkg/workstation/services" + "github.com/windsorcli/cli/pkg/workstation/ssh" ) // ============================================================================= diff --git a/pkg/network/shims.go b/pkg/workstation/network/shims.go similarity index 100% rename from pkg/network/shims.go rename to pkg/workstation/network/shims.go diff --git a/pkg/network/shims_test.go b/pkg/workstation/network/shims_test.go similarity index 100% rename from pkg/network/shims_test.go rename to pkg/workstation/network/shims_test.go diff --git a/pkg/network/windows_network.go b/pkg/workstation/network/windows_network.go similarity index 100% rename from pkg/network/windows_network.go rename to pkg/workstation/network/windows_network.go diff --git a/pkg/network/windows_network_test.go b/pkg/workstation/network/windows_network_test.go similarity index 100% rename from pkg/network/windows_network_test.go rename to pkg/workstation/network/windows_network_test.go diff --git a/pkg/services/dns_service.go b/pkg/workstation/services/dns_service.go similarity index 100% rename from pkg/services/dns_service.go rename to pkg/workstation/services/dns_service.go diff --git a/pkg/services/dns_service_test.go b/pkg/workstation/services/dns_service_test.go similarity index 100% rename from pkg/services/dns_service_test.go rename to pkg/workstation/services/dns_service_test.go diff --git a/pkg/services/git_livereload_service.go b/pkg/workstation/services/git_livereload_service.go similarity index 100% rename from pkg/services/git_livereload_service.go rename to pkg/workstation/services/git_livereload_service.go diff --git a/pkg/services/git_livereload_service_test.go b/pkg/workstation/services/git_livereload_service_test.go similarity index 100% rename from pkg/services/git_livereload_service_test.go rename to pkg/workstation/services/git_livereload_service_test.go diff --git a/pkg/services/localstack_service.go b/pkg/workstation/services/localstack_service.go similarity index 100% rename from pkg/services/localstack_service.go rename to pkg/workstation/services/localstack_service.go diff --git a/pkg/services/localstack_service_test.go b/pkg/workstation/services/localstack_service_test.go similarity index 100% rename from pkg/services/localstack_service_test.go rename to pkg/workstation/services/localstack_service_test.go diff --git a/pkg/services/mock_service.go b/pkg/workstation/services/mock_service.go similarity index 100% rename from pkg/services/mock_service.go rename to pkg/workstation/services/mock_service.go diff --git a/pkg/services/mock_service_test.go b/pkg/workstation/services/mock_service_test.go similarity index 100% rename from pkg/services/mock_service_test.go rename to pkg/workstation/services/mock_service_test.go diff --git a/pkg/services/registry_service.go b/pkg/workstation/services/registry_service.go similarity index 100% rename from pkg/services/registry_service.go rename to pkg/workstation/services/registry_service.go diff --git a/pkg/services/registry_service_test.go b/pkg/workstation/services/registry_service_test.go similarity index 100% rename from pkg/services/registry_service_test.go rename to pkg/workstation/services/registry_service_test.go diff --git a/pkg/services/service.go b/pkg/workstation/services/service.go similarity index 100% rename from pkg/services/service.go rename to pkg/workstation/services/service.go diff --git a/pkg/services/service_test.go b/pkg/workstation/services/service_test.go similarity index 100% rename from pkg/services/service_test.go rename to pkg/workstation/services/service_test.go diff --git a/pkg/services/shims.go b/pkg/workstation/services/shims.go similarity index 100% rename from pkg/services/shims.go rename to pkg/workstation/services/shims.go diff --git a/pkg/services/talos_service.go b/pkg/workstation/services/talos_service.go similarity index 100% rename from pkg/services/talos_service.go rename to pkg/workstation/services/talos_service.go diff --git a/pkg/services/talos_service_test.go b/pkg/workstation/services/talos_service_test.go similarity index 100% rename from pkg/services/talos_service_test.go rename to pkg/workstation/services/talos_service_test.go diff --git a/pkg/ssh/client.go b/pkg/workstation/ssh/client.go similarity index 100% rename from pkg/ssh/client.go rename to pkg/workstation/ssh/client.go diff --git a/pkg/ssh/client_test.go b/pkg/workstation/ssh/client_test.go similarity index 100% rename from pkg/ssh/client_test.go rename to pkg/workstation/ssh/client_test.go diff --git a/pkg/ssh/mock_client.go b/pkg/workstation/ssh/mock_client.go similarity index 100% rename from pkg/ssh/mock_client.go rename to pkg/workstation/ssh/mock_client.go diff --git a/pkg/ssh/mock_client_test.go b/pkg/workstation/ssh/mock_client_test.go similarity index 100% rename from pkg/ssh/mock_client_test.go rename to pkg/workstation/ssh/mock_client_test.go diff --git a/pkg/ssh/real_client.go b/pkg/workstation/ssh/real_client.go similarity index 100% rename from pkg/ssh/real_client.go rename to pkg/workstation/ssh/real_client.go diff --git a/pkg/ssh/shims.go b/pkg/workstation/ssh/shims.go similarity index 100% rename from pkg/ssh/shims.go rename to pkg/workstation/ssh/shims.go diff --git a/pkg/virt/colima_virt.go b/pkg/workstation/virt/colima_virt.go similarity index 100% rename from pkg/virt/colima_virt.go rename to pkg/workstation/virt/colima_virt.go diff --git a/pkg/virt/colima_virt_test.go b/pkg/workstation/virt/colima_virt_test.go similarity index 100% rename from pkg/virt/colima_virt_test.go rename to pkg/workstation/virt/colima_virt_test.go diff --git a/pkg/virt/docker_virt.go b/pkg/workstation/virt/docker_virt.go similarity index 99% rename from pkg/virt/docker_virt.go rename to pkg/workstation/virt/docker_virt.go index bdfd61038..e2733e7bb 100644 --- a/pkg/virt/docker_virt.go +++ b/pkg/workstation/virt/docker_virt.go @@ -17,7 +17,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/services" + "github.com/windsorcli/cli/pkg/workstation/services" ) // ============================================================================= diff --git a/pkg/virt/docker_virt_test.go b/pkg/workstation/virt/docker_virt_test.go similarity index 99% rename from pkg/virt/docker_virt_test.go rename to pkg/workstation/virt/docker_virt_test.go index bd22794c7..53cb47f11 100644 --- a/pkg/virt/docker_virt_test.go +++ b/pkg/workstation/virt/docker_virt_test.go @@ -14,7 +14,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/services" + "github.com/windsorcli/cli/pkg/workstation/services" ) // ============================================================================= diff --git a/pkg/virt/mock_virt.go b/pkg/workstation/virt/mock_virt.go similarity index 100% rename from pkg/virt/mock_virt.go rename to pkg/workstation/virt/mock_virt.go diff --git a/pkg/virt/mock_virt_test.go b/pkg/workstation/virt/mock_virt_test.go similarity index 99% rename from pkg/virt/mock_virt_test.go rename to pkg/workstation/virt/mock_virt_test.go index 4b0ca92e2..a6caf606f 100644 --- a/pkg/virt/mock_virt_test.go +++ b/pkg/workstation/virt/mock_virt_test.go @@ -10,7 +10,7 @@ import ( "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/services" + "github.com/windsorcli/cli/pkg/workstation/services" "github.com/windsorcli/cli/pkg/shell" ) diff --git a/pkg/virt/shims.go b/pkg/workstation/virt/shims.go similarity index 100% rename from pkg/virt/shims.go rename to pkg/workstation/virt/shims.go diff --git a/pkg/virt/shims_test.go b/pkg/workstation/virt/shims_test.go similarity index 100% rename from pkg/virt/shims_test.go rename to pkg/workstation/virt/shims_test.go diff --git a/pkg/virt/virt.go b/pkg/workstation/virt/virt.go similarity index 100% rename from pkg/virt/virt.go rename to pkg/workstation/virt/virt.go diff --git a/pkg/virt/virt_test.go b/pkg/workstation/virt/virt_test.go similarity index 99% rename from pkg/virt/virt_test.go rename to pkg/workstation/virt/virt_test.go index d1afe8ad6..de6dead81 100644 --- a/pkg/virt/virt_test.go +++ b/pkg/workstation/virt/virt_test.go @@ -16,7 +16,7 @@ import ( "github.com/shirou/gopsutil/mem" "github.com/windsorcli/cli/pkg/config" "github.com/windsorcli/cli/pkg/di" - "github.com/windsorcli/cli/pkg/services" + "github.com/windsorcli/cli/pkg/workstation/services" "github.com/windsorcli/cli/pkg/shell" )