From 4b8e4ede5cf5381c023338d356287d6f4ae3aab6 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Wed, 11 Nov 2026 20:20:38 -0600 Subject: [PATCH] refactor(platform): move cmd/pro to cmd/platform --- CONTRIBUTING.md | 2 +- cmd/env_flags_test.go | 2 +- cmd/{pro => platform}/check_update.go | 6 +++--- cmd/{pro => platform}/cluster/add.go | 2 +- cmd/{pro => platform}/cluster/add_flags.go | 2 +- cmd/{pro => platform}/cluster/cluster.go | 2 +- cmd/{pro => platform}/cluster/list.go | 4 ++-- cmd/{pro => platform}/cmdutil/cmdutil.go | 6 +++--- cmd/{pro => platform}/cmdutil/cmdutil_test.go | 2 +- .../completion/suggestions.go | 0 cmd/{pro => platform}/daemon/daemon.go | 2 +- cmd/{pro => platform}/daemon/netcheck.go | 4 ++-- cmd/{pro => platform}/daemon/start.go | 4 ++-- cmd/{pro => platform}/daemon/status.go | 4 ++-- cmd/{pro => platform}/flags/flags.go | 0 cmd/{pro => platform}/health.go | 6 +++--- cmd/{pro => platform}/list.go | 4 ++-- cmd/{pro => platform}/login.go | 4 ++-- cmd/{pro => platform}/login_test.go | 4 ++-- cmd/{pro => platform}/logout.go | 4 ++-- cmd/{pro/pro.go => platform/platform.go} | 18 +++++++++--------- .../pro_test.go => platform/platform_test.go} | 2 +- cmd/{pro => platform}/project/list.go | 4 ++-- cmd/{pro => platform}/project/project.go | 2 +- .../provider/create/create.go | 2 +- .../provider/create/workspace.go | 2 +- cmd/{pro => platform}/provider/delete.go | 2 +- cmd/{pro => platform}/provider/exec.go | 0 cmd/{pro => platform}/provider/get/get.go | 2 +- cmd/{pro => platform}/provider/get/self.go | 2 +- cmd/{pro => platform}/provider/get/version.go | 2 +- .../provider/get/workspace.go | 2 +- cmd/{pro => platform}/provider/health.go | 2 +- cmd/{pro => platform}/provider/health_test.go | 2 +- .../provider/list/clusters.go | 2 +- cmd/{pro => platform}/provider/list/list.go | 2 +- .../provider/list/projects.go | 2 +- .../provider/list/templates.go | 2 +- .../provider/list/workspaces.go | 2 +- cmd/{pro => platform}/provider/provider.go | 12 ++++++------ cmd/{pro => platform}/provider/rebuild.go | 2 +- cmd/{pro => platform}/provider/ssh.go | 2 +- cmd/{pro => platform}/provider/status.go | 2 +- cmd/{pro => platform}/provider/stop.go | 2 +- cmd/{pro => platform}/provider/up.go | 2 +- .../provider/update/update.go | 2 +- .../provider/update/workspace.go | 2 +- cmd/{pro => platform}/provider/watch/watch.go | 2 +- .../provider/watch/workspaces.go | 2 +- cmd/{pro => platform}/self.go | 6 +++--- cmd/{pro => platform}/start.go | 4 ++-- cmd/{pro => platform}/start_docker.go | 2 +- cmd/{pro => platform}/start_docker_test.go | 2 +- cmd/{pro => platform}/start_flags.go | 4 ++-- .../start_reachability_test.go | 2 +- cmd/{pro => platform}/start_test.go | 2 +- cmd/{pro => platform}/start_uninstall.go | 2 +- cmd/{pro => platform}/template/list.go | 4 ++-- cmd/{pro => platform}/template/template.go | 2 +- cmd/{pro => platform}/update_provider.go | 6 +++--- cmd/{pro => platform}/user/reset_password.go | 2 +- cmd/{pro => platform}/user/user.go | 2 +- cmd/{pro => platform}/version.go | 6 +++--- cmd/{pro => platform}/workspace/create.go | 4 ++-- cmd/{pro => platform}/workspace/import.go | 4 ++-- cmd/{pro => platform}/workspace/list.go | 4 ++-- cmd/{pro => platform}/workspace/rebuild.go | 2 +- cmd/{pro => platform}/workspace/sleep.go | 2 +- cmd/{pro => platform}/workspace/update.go | 4 ++-- cmd/{pro => platform}/workspace/wakeup.go | 2 +- cmd/{pro => platform}/workspace/watch.go | 4 ++-- cmd/{pro => platform}/workspace/workspace.go | 2 +- cmd/root.go | 4 ++-- pkg/platform/form/form.go | 2 +- 74 files changed, 114 insertions(+), 114 deletions(-) rename cmd/{pro => platform}/check_update.go (93%) rename cmd/{pro => platform}/cluster/add.go (99%) rename cmd/{pro => platform}/cluster/add_flags.go (97%) rename cmd/{pro => platform}/cluster/cluster.go (87%) rename cmd/{pro => platform}/cluster/list.go (95%) rename cmd/{pro => platform}/cmdutil/cmdutil.go (95%) rename cmd/{pro => platform}/cmdutil/cmdutil_test.go (98%) rename cmd/{pro => platform}/completion/suggestions.go (100%) rename cmd/{pro => platform}/daemon/daemon.go (89%) rename cmd/{pro => platform}/daemon/netcheck.go (95%) rename cmd/{pro => platform}/daemon/start.go (97%) rename cmd/{pro => platform}/daemon/status.go (91%) rename cmd/{pro => platform}/flags/flags.go (100%) rename cmd/{pro => platform}/health.go (90%) rename cmd/{pro => platform}/list.go (98%) rename cmd/{pro => platform}/login.go (99%) rename cmd/{pro => platform}/login_test.go (98%) rename cmd/{pro => platform}/logout.go (98%) rename cmd/{pro/pro.go => platform/platform.go} (75%) rename cmd/{pro/pro_test.go => platform/platform_test.go} (98%) rename cmd/{pro => platform}/project/list.go (93%) rename cmd/{pro => platform}/project/project.go (86%) rename cmd/{pro => platform}/provider/create/create.go (87%) rename cmd/{pro => platform}/provider/create/workspace.go (98%) rename cmd/{pro => platform}/provider/delete.go (97%) rename cmd/{pro => platform}/provider/exec.go (100%) rename cmd/{pro => platform}/provider/get/get.go (89%) rename cmd/{pro => platform}/provider/get/self.go (95%) rename cmd/{pro => platform}/provider/get/version.go (97%) rename cmd/{pro => platform}/provider/get/workspace.go (96%) rename cmd/{pro => platform}/provider/health.go (96%) rename cmd/{pro => platform}/provider/health_test.go (96%) rename cmd/{pro => platform}/provider/list/clusters.go (97%) rename cmd/{pro => platform}/provider/list/list.go (90%) rename cmd/{pro => platform}/provider/list/projects.go (97%) rename cmd/{pro => platform}/provider/list/templates.go (99%) rename cmd/{pro => platform}/provider/list/workspaces.go (98%) rename cmd/{pro => platform}/provider/provider.go (82%) rename cmd/{pro => platform}/provider/rebuild.go (97%) rename cmd/{pro => platform}/provider/ssh.go (95%) rename cmd/{pro => platform}/provider/status.go (97%) rename cmd/{pro => platform}/provider/stop.go (95%) rename cmd/{pro => platform}/provider/up.go (98%) rename cmd/{pro => platform}/provider/update/update.go (87%) rename cmd/{pro => platform}/provider/update/workspace.go (98%) rename cmd/{pro => platform}/provider/watch/watch.go (87%) rename cmd/{pro => platform}/provider/watch/workspaces.go (99%) rename cmd/{pro => platform}/self.go (88%) rename cmd/{pro => platform}/start.go (99%) rename cmd/{pro => platform}/start_docker.go (99%) rename cmd/{pro => platform}/start_docker_test.go (99%) rename cmd/{pro => platform}/start_flags.go (97%) rename cmd/{pro => platform}/start_reachability_test.go (99%) rename cmd/{pro => platform}/start_test.go (99%) rename cmd/{pro => platform}/start_uninstall.go (99%) rename cmd/{pro => platform}/template/list.go (95%) rename cmd/{pro => platform}/template/template.go (86%) rename cmd/{pro => platform}/update_provider.go (97%) rename cmd/{pro => platform}/user/reset_password.go (99%) rename cmd/{pro => platform}/user/user.go (86%) rename cmd/{pro => platform}/version.go (90%) rename cmd/{pro => platform}/workspace/create.go (94%) rename cmd/{pro => platform}/workspace/import.go (98%) rename cmd/{pro => platform}/workspace/list.go (95%) rename cmd/{pro => platform}/workspace/rebuild.go (98%) rename cmd/{pro => platform}/workspace/sleep.go (99%) rename cmd/{pro => platform}/workspace/update.go (94%) rename cmd/{pro => platform}/workspace/wakeup.go (98%) rename cmd/{pro => platform}/workspace/watch.go (96%) rename cmd/{pro => platform}/workspace/workspace.go (91%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9535d4688f..532d83da1d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -173,7 +173,7 @@ as well as successful calls. The browser tunnel regression in `pkg/ide/opener` injects a failing `/dev/null` open on Linux and macOS. It checks that a failed helper launch releases its -reserved port. Platform reachability tests in `cmd/pro` use local HTTP servers +reserved port. Platform reachability tests in `cmd/platform` use local HTTP servers to check connection cleanup between probes. Cross-compilation checks platform buildability, not runtime behavior. Windows diff --git a/cmd/env_flags_test.go b/cmd/env_flags_test.go index ca37732fc8..62a3d59c50 100644 --- a/cmd/env_flags_test.go +++ b/cmd/env_flags_test.go @@ -146,7 +146,7 @@ func TestOptInEnvFlags_EnvSatisfiesRequired(t *testing.T) { // TestOptInEnvFlags_PlatformSubcommandSweep asserts that DEVSY_HOST applies to // every platform subcommand that exposes --host (and similarly for --project). -// This catches the regression where a future addition to cmd/pro/ forgets +// This catches the regression where a future addition to cmd/platform/ forgets // the inline BindEnv call. func TestOptInEnvFlags_PlatformSubcommandSweep(t *testing.T) { t.Setenv(envPlatformEnabled, "true") diff --git a/cmd/pro/check_update.go b/cmd/platform/check_update.go similarity index 93% rename from cmd/pro/check_update.go rename to cmd/platform/check_update.go index 717d1bf93a..8399bc657b 100644 --- a/cmd/pro/check_update.go +++ b/cmd/platform/check_update.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/cluster/add.go b/cmd/platform/cluster/add.go similarity index 99% rename from cmd/pro/cluster/add.go rename to cmd/platform/cluster/add.go index ba5429ae63..43b81e4786 100644 --- a/cmd/pro/cluster/add.go +++ b/cmd/platform/cluster/add.go @@ -11,7 +11,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/log" "github.com/devsy-org/devsy/pkg/platform" diff --git a/cmd/pro/cluster/add_flags.go b/cmd/platform/cluster/add_flags.go similarity index 97% rename from cmd/pro/cluster/add_flags.go rename to cmd/platform/cluster/add_flags.go index e4a7841303..cecec75c53 100644 --- a/cmd/pro/cluster/add_flags.go +++ b/cmd/platform/cluster/add_flags.go @@ -1,7 +1,7 @@ package cluster import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" "github.com/spf13/cobra" diff --git a/cmd/pro/cluster/cluster.go b/cmd/platform/cluster/cluster.go similarity index 87% rename from cmd/pro/cluster/cluster.go rename to cmd/platform/cluster/cluster.go index 99ccb1ac82..35836d4676 100644 --- a/cmd/pro/cluster/cluster.go +++ b/cmd/platform/cluster/cluster.go @@ -1,7 +1,7 @@ package cluster import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/cluster/list.go b/cmd/platform/cluster/list.go similarity index 95% rename from cmd/pro/cluster/list.go rename to cmd/platform/cluster/list.go index 435b9cde13..cb924d97cc 100644 --- a/cmd/pro/cluster/list.go +++ b/cmd/platform/cluster/list.go @@ -6,8 +6,8 @@ import ( "fmt" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/cmdutil/cmdutil.go b/cmd/platform/cmdutil/cmdutil.go similarity index 95% rename from cmd/pro/cmdutil/cmdutil.go rename to cmd/platform/cmdutil/cmdutil.go index 72262e2d01..daab8b1b3d 100644 --- a/cmd/pro/cmdutil/cmdutil.go +++ b/cmd/platform/cmdutil/cmdutil.go @@ -1,14 +1,14 @@ // Package cmdutil contains shared helpers used by the 'devsy platform' command and // its resource sub-groups (workspace, cluster, project, template). It exists to -// avoid an import cycle between cmd/pro and its child packages. +// avoid an import cycle between cmd/platform and its child packages. package cmdutil import ( "context" "fmt" - "github.com/devsy-org/devsy/cmd/pro/completion" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/completion" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/cmdutil/cmdutil_test.go b/cmd/platform/cmdutil/cmdutil_test.go similarity index 98% rename from cmd/pro/cmdutil/cmdutil_test.go rename to cmd/platform/cmdutil/cmdutil_test.go index 36946f51cc..e10b35c72b 100644 --- a/cmd/pro/cmdutil/cmdutil_test.go +++ b/cmd/platform/cmdutil/cmdutil_test.go @@ -7,7 +7,7 @@ import ( "testing" rootflags "github.com/devsy-org/devsy/cmd/flags" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/completion/suggestions.go b/cmd/platform/completion/suggestions.go similarity index 100% rename from cmd/pro/completion/suggestions.go rename to cmd/platform/completion/suggestions.go diff --git a/cmd/pro/daemon/daemon.go b/cmd/platform/daemon/daemon.go similarity index 89% rename from cmd/pro/daemon/daemon.go rename to cmd/platform/daemon/daemon.go index 3449104e44..213ead670c 100644 --- a/cmd/pro/daemon/daemon.go +++ b/cmd/platform/daemon/daemon.go @@ -1,7 +1,7 @@ package daemon import ( - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/daemon/netcheck.go b/cmd/platform/daemon/netcheck.go similarity index 95% rename from cmd/pro/daemon/netcheck.go rename to cmd/platform/daemon/netcheck.go index 300740933d..f6b403bc3b 100644 --- a/cmd/pro/daemon/netcheck.go +++ b/cmd/platform/daemon/netcheck.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" daemon "github.com/devsy-org/devsy/pkg/daemon/platform" providerpkg "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/daemon/start.go b/cmd/platform/daemon/start.go similarity index 97% rename from cmd/pro/daemon/start.go rename to cmd/platform/daemon/start.go index 12fca03112..bca0b802f8 100644 --- a/cmd/pro/daemon/start.go +++ b/cmd/platform/daemon/start.go @@ -10,8 +10,8 @@ import ( "syscall" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" daemon "github.com/devsy-org/devsy/pkg/daemon/platform" "github.com/devsy-org/devsy/pkg/log" diff --git a/cmd/pro/daemon/status.go b/cmd/platform/daemon/status.go similarity index 91% rename from cmd/pro/daemon/status.go rename to cmd/platform/daemon/status.go index ea84a07911..78f8c05ef8 100644 --- a/cmd/pro/daemon/status.go +++ b/cmd/platform/daemon/status.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" platformdaemon "github.com/devsy-org/devsy/pkg/daemon/platform" providerpkg "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/flags/flags.go b/cmd/platform/flags/flags.go similarity index 100% rename from cmd/pro/flags/flags.go rename to cmd/platform/flags/flags.go diff --git a/cmd/pro/health.go b/cmd/platform/health.go similarity index 90% rename from cmd/pro/health.go rename to cmd/platform/health.go index 3fa821623c..57807246ab 100644 --- a/cmd/pro/health.go +++ b/cmd/platform/health.go @@ -1,10 +1,10 @@ -package pro +package platform import ( "context" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/list.go b/cmd/platform/list.go similarity index 98% rename from cmd/pro/list.go rename to cmd/platform/list.go index 1b88acecea..1bc7164d0e 100644 --- a/cmd/pro/list.go +++ b/cmd/platform/list.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" @@ -7,7 +7,7 @@ import ( "sort" "time" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/login.go b/cmd/platform/login.go similarity index 99% rename from cmd/pro/login.go rename to cmd/platform/login.go index 5074b32d66..48e9aea638 100644 --- a/cmd/pro/login.go +++ b/cmd/platform/login.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" @@ -7,7 +7,7 @@ import ( "strings" "github.com/blang/semver/v4" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" providercmd "github.com/devsy-org/devsy/cmd/provider" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/login_test.go b/cmd/platform/login_test.go similarity index 98% rename from cmd/pro/login_test.go rename to cmd/platform/login_test.go index f4b4197142..17f7dfffad 100644 --- a/cmd/pro/login_test.go +++ b/cmd/platform/login_test.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" @@ -6,7 +6,7 @@ import ( "time" rootflags "github.com/devsy-org/devsy/cmd/flags" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" "github.com/stretchr/testify/suite" diff --git a/cmd/pro/logout.go b/cmd/platform/logout.go similarity index 98% rename from cmd/pro/logout.go rename to cmd/platform/logout.go index 7ecc28b963..89f52b159e 100644 --- a/cmd/pro/logout.go +++ b/cmd/platform/logout.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" @@ -7,7 +7,7 @@ import ( "sync" "time" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" providercmd "github.com/devsy-org/devsy/cmd/provider" "github.com/devsy-org/devsy/pkg/client/clientimplementation" "github.com/devsy-org/devsy/pkg/config" diff --git a/cmd/pro/pro.go b/cmd/platform/platform.go similarity index 75% rename from cmd/pro/pro.go rename to cmd/platform/platform.go index d661a1e1c9..d8ba30d31e 100644 --- a/cmd/pro/pro.go +++ b/cmd/platform/platform.go @@ -1,15 +1,15 @@ -package pro +package platform import ( "github.com/devsy-org/devsy/cmd/flags" - procluster "github.com/devsy-org/devsy/cmd/pro/cluster" - "github.com/devsy-org/devsy/cmd/pro/daemon" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" - proproject "github.com/devsy-org/devsy/cmd/pro/project" - "github.com/devsy-org/devsy/cmd/pro/provider" - protemplate "github.com/devsy-org/devsy/cmd/pro/template" - prouser "github.com/devsy-org/devsy/cmd/pro/user" - proworkspace "github.com/devsy-org/devsy/cmd/pro/workspace" + procluster "github.com/devsy-org/devsy/cmd/platform/cluster" + "github.com/devsy-org/devsy/cmd/platform/daemon" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" + proproject "github.com/devsy-org/devsy/cmd/platform/project" + "github.com/devsy-org/devsy/cmd/platform/provider" + protemplate "github.com/devsy-org/devsy/cmd/platform/template" + prouser "github.com/devsy-org/devsy/cmd/platform/user" + proworkspace "github.com/devsy-org/devsy/cmd/platform/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/pro/pro_test.go b/cmd/platform/platform_test.go similarity index 98% rename from cmd/pro/pro_test.go rename to cmd/platform/platform_test.go index cc608bd0c1..e937008562 100644 --- a/cmd/pro/pro_test.go +++ b/cmd/platform/platform_test.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "testing" diff --git a/cmd/pro/project/list.go b/cmd/platform/project/list.go similarity index 93% rename from cmd/pro/project/list.go rename to cmd/platform/project/list.go index e0b54f8628..8949ed15e1 100644 --- a/cmd/pro/project/list.go +++ b/cmd/platform/project/list.go @@ -5,8 +5,8 @@ import ( "encoding/json" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/project/project.go b/cmd/platform/project/project.go similarity index 86% rename from cmd/pro/project/project.go rename to cmd/platform/project/project.go index c6e9375857..11e932cec4 100644 --- a/cmd/pro/project/project.go +++ b/cmd/platform/project/project.go @@ -1,7 +1,7 @@ package project import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/create/create.go b/cmd/platform/provider/create/create.go similarity index 87% rename from cmd/pro/provider/create/create.go rename to cmd/platform/provider/create/create.go index 6190d15b51..cc438fb8f6 100644 --- a/cmd/pro/provider/create/create.go +++ b/cmd/platform/provider/create/create.go @@ -1,7 +1,7 @@ package create import ( - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/create/workspace.go b/cmd/platform/provider/create/workspace.go similarity index 98% rename from cmd/pro/provider/create/workspace.go rename to cmd/platform/provider/create/workspace.go index 65e3a312a7..a49f694b86 100644 --- a/cmd/pro/provider/create/workspace.go +++ b/cmd/platform/provider/create/workspace.go @@ -8,7 +8,7 @@ import ( "os" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" diff --git a/cmd/pro/provider/delete.go b/cmd/platform/provider/delete.go similarity index 97% rename from cmd/pro/provider/delete.go rename to cmd/platform/provider/delete.go index d60c673687..587374557b 100644 --- a/cmd/pro/provider/delete.go +++ b/cmd/platform/provider/delete.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/spf13/cobra" diff --git a/cmd/pro/provider/exec.go b/cmd/platform/provider/exec.go similarity index 100% rename from cmd/pro/provider/exec.go rename to cmd/platform/provider/exec.go diff --git a/cmd/pro/provider/get/get.go b/cmd/platform/provider/get/get.go similarity index 89% rename from cmd/pro/provider/get/get.go rename to cmd/platform/provider/get/get.go index f62d0e4e94..b1ec9143f8 100644 --- a/cmd/pro/provider/get/get.go +++ b/cmd/platform/provider/get/get.go @@ -1,7 +1,7 @@ package get import ( - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/get/self.go b/cmd/platform/provider/get/self.go similarity index 95% rename from cmd/pro/provider/get/self.go rename to cmd/platform/provider/get/self.go index eeaf5063f6..64f9df87cc 100644 --- a/cmd/pro/provider/get/self.go +++ b/cmd/platform/provider/get/self.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/get/version.go b/cmd/platform/provider/get/version.go similarity index 97% rename from cmd/pro/provider/get/version.go rename to cmd/platform/provider/get/version.go index c13c123df0..3d4a363e2e 100644 --- a/cmd/pro/provider/get/version.go +++ b/cmd/platform/provider/get/version.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" diff --git a/cmd/pro/provider/get/workspace.go b/cmd/platform/provider/get/workspace.go similarity index 96% rename from cmd/pro/provider/get/workspace.go rename to cmd/platform/provider/get/workspace.go index c1ab6099f7..d4b15e1085 100644 --- a/cmd/pro/provider/get/workspace.go +++ b/cmd/platform/provider/get/workspace.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/spf13/cobra" diff --git a/cmd/pro/provider/health.go b/cmd/platform/provider/health.go similarity index 96% rename from cmd/pro/provider/health.go rename to cmd/platform/provider/health.go index fdb9536555..333eac7246 100644 --- a/cmd/pro/provider/health.go +++ b/cmd/platform/provider/health.go @@ -9,7 +9,7 @@ import ( "net/url" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" devsyhttp "github.com/devsy-org/devsy/pkg/http" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/spf13/cobra" diff --git a/cmd/pro/provider/health_test.go b/cmd/platform/provider/health_test.go similarity index 96% rename from cmd/pro/provider/health_test.go rename to cmd/platform/provider/health_test.go index 2c8ca6376b..7b30779281 100644 --- a/cmd/pro/provider/health_test.go +++ b/cmd/platform/provider/health_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" devsyhttp "github.com/devsy-org/devsy/pkg/http" ) diff --git a/cmd/pro/provider/list/clusters.go b/cmd/platform/provider/list/clusters.go similarity index 97% rename from cmd/pro/provider/list/clusters.go rename to cmd/platform/provider/list/clusters.go index d0e77aa28c..7f7eca0ca6 100644 --- a/cmd/pro/provider/list/clusters.go +++ b/cmd/platform/provider/list/clusters.go @@ -7,7 +7,7 @@ import ( "os" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/spf13/cobra" diff --git a/cmd/pro/provider/list/list.go b/cmd/platform/provider/list/list.go similarity index 90% rename from cmd/pro/provider/list/list.go rename to cmd/platform/provider/list/list.go index fd9d7b8217..30e422ca48 100644 --- a/cmd/pro/provider/list/list.go +++ b/cmd/platform/provider/list/list.go @@ -1,7 +1,7 @@ package list import ( - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/list/projects.go b/cmd/platform/provider/list/projects.go similarity index 97% rename from cmd/pro/provider/list/projects.go rename to cmd/platform/provider/list/projects.go index 2a5ae61672..cb9a9878f8 100644 --- a/cmd/pro/provider/list/projects.go +++ b/cmd/platform/provider/list/projects.go @@ -7,7 +7,7 @@ import ( "os" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/pro/provider/list/templates.go b/cmd/platform/provider/list/templates.go similarity index 99% rename from cmd/pro/provider/list/templates.go rename to cmd/platform/provider/list/templates.go index 3aa9f44dae..b2f3e16168 100644 --- a/cmd/pro/provider/list/templates.go +++ b/cmd/platform/provider/list/templates.go @@ -12,7 +12,7 @@ import ( "github.com/blang/semver/v4" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/devsy-org/devsy/pkg/platform/kube" diff --git a/cmd/pro/provider/list/workspaces.go b/cmd/platform/provider/list/workspaces.go similarity index 98% rename from cmd/pro/provider/list/workspaces.go rename to cmd/platform/provider/list/workspaces.go index ff848ae7d3..f7ddef2308 100644 --- a/cmd/pro/provider/list/workspaces.go +++ b/cmd/platform/provider/list/workspaces.go @@ -7,7 +7,7 @@ import ( "os" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/log" "github.com/devsy-org/devsy/pkg/platform" diff --git a/cmd/pro/provider/provider.go b/cmd/platform/provider/provider.go similarity index 82% rename from cmd/pro/provider/provider.go rename to cmd/platform/provider/provider.go index bfc995b612..97a4b39fa6 100644 --- a/cmd/pro/provider/provider.go +++ b/cmd/platform/provider/provider.go @@ -3,12 +3,12 @@ package provider import ( "os" - "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/provider/create" - "github.com/devsy-org/devsy/cmd/pro/provider/get" - "github.com/devsy-org/devsy/cmd/pro/provider/list" - "github.com/devsy-org/devsy/cmd/pro/provider/update" - "github.com/devsy-org/devsy/cmd/pro/provider/watch" + "github.com/devsy-org/devsy/cmd/platform/flags" + "github.com/devsy-org/devsy/cmd/platform/provider/create" + "github.com/devsy-org/devsy/cmd/platform/provider/get" + "github.com/devsy-org/devsy/cmd/platform/provider/list" + "github.com/devsy-org/devsy/cmd/platform/provider/update" + "github.com/devsy-org/devsy/cmd/platform/provider/watch" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" diff --git a/cmd/pro/provider/rebuild.go b/cmd/platform/provider/rebuild.go similarity index 97% rename from cmd/pro/provider/rebuild.go rename to cmd/platform/provider/rebuild.go index 434270151e..b0366420c7 100644 --- a/cmd/pro/provider/rebuild.go +++ b/cmd/platform/provider/rebuild.go @@ -7,7 +7,7 @@ import ( "net/url" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" "github.com/devsy-org/devsy/pkg/platform" diff --git a/cmd/pro/provider/ssh.go b/cmd/platform/provider/ssh.go similarity index 95% rename from cmd/pro/provider/ssh.go rename to cmd/platform/provider/ssh.go index 371212b26c..216f2d629a 100644 --- a/cmd/pro/provider/ssh.go +++ b/cmd/platform/provider/ssh.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/spf13/cobra" diff --git a/cmd/pro/provider/status.go b/cmd/platform/provider/status.go similarity index 97% rename from cmd/pro/provider/status.go rename to cmd/platform/provider/status.go index ea1a76eee1..001196c880 100644 --- a/cmd/pro/provider/status.go +++ b/cmd/platform/provider/status.go @@ -8,7 +8,7 @@ import ( "os" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" diff --git a/cmd/pro/provider/stop.go b/cmd/platform/provider/stop.go similarity index 95% rename from cmd/pro/provider/stop.go rename to cmd/platform/provider/stop.go index 0f93a631a8..c10c8ae0eb 100644 --- a/cmd/pro/provider/stop.go +++ b/cmd/platform/provider/stop.go @@ -7,7 +7,7 @@ import ( "os" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/up.go b/cmd/platform/provider/up.go similarity index 98% rename from cmd/pro/provider/up.go rename to cmd/platform/provider/up.go index 13a42a4bae..74bc77ea0e 100644 --- a/cmd/pro/provider/up.go +++ b/cmd/platform/provider/up.go @@ -9,7 +9,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/log" "github.com/devsy-org/devsy/pkg/platform" diff --git a/cmd/pro/provider/update/update.go b/cmd/platform/provider/update/update.go similarity index 87% rename from cmd/pro/provider/update/update.go rename to cmd/platform/provider/update/update.go index 57c55cc300..a2089b291b 100644 --- a/cmd/pro/provider/update/update.go +++ b/cmd/platform/provider/update/update.go @@ -1,7 +1,7 @@ package update import ( - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/update/workspace.go b/cmd/platform/provider/update/workspace.go similarity index 98% rename from cmd/pro/provider/update/workspace.go rename to cmd/platform/provider/update/workspace.go index da6c68ebd1..8322615634 100644 --- a/cmd/pro/provider/update/workspace.go +++ b/cmd/platform/provider/update/workspace.go @@ -8,7 +8,7 @@ import ( "os" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/devsy-org/devsy/pkg/platform/form" diff --git a/cmd/pro/provider/watch/watch.go b/cmd/platform/provider/watch/watch.go similarity index 87% rename from cmd/pro/provider/watch/watch.go rename to cmd/platform/provider/watch/watch.go index 051af63294..29e2064868 100644 --- a/cmd/pro/provider/watch/watch.go +++ b/cmd/platform/provider/watch/watch.go @@ -1,7 +1,7 @@ package watch import ( - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/provider/watch/workspaces.go b/cmd/platform/provider/watch/workspaces.go similarity index 99% rename from cmd/pro/provider/watch/workspaces.go rename to cmd/platform/provider/watch/workspaces.go index 5ca9fedd52..b9ebd4a474 100644 --- a/cmd/pro/provider/watch/workspaces.go +++ b/cmd/platform/provider/watch/workspaces.go @@ -14,7 +14,7 @@ import ( devsyclient "github.com/devsy-org/api/pkg/clientset/versioned" informers "github.com/devsy-org/api/pkg/informers/externalversions" informermanagementv1 "github.com/devsy-org/api/pkg/informers/externalversions/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/platform/client" diff --git a/cmd/pro/self.go b/cmd/platform/self.go similarity index 88% rename from cmd/pro/self.go rename to cmd/platform/self.go index a708818ed8..85614647b0 100644 --- a/cmd/pro/self.go +++ b/cmd/platform/self.go @@ -1,10 +1,10 @@ -package pro +package platform import ( "context" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/start.go b/cmd/platform/start.go similarity index 99% rename from cmd/pro/start.go rename to cmd/platform/start.go index 2e7536e90f..2b1ce5b94e 100644 --- a/cmd/pro/start.go +++ b/cmd/platform/start.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "bytes" @@ -21,7 +21,7 @@ import ( storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" "github.com/devsy-org/api/pkg/auth" devsyclientset "github.com/devsy-org/api/pkg/clientset/versioned" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/log" devsyopen "github.com/devsy-org/devsy/pkg/open" diff --git a/cmd/pro/start_docker.go b/cmd/platform/start_docker.go similarity index 99% rename from cmd/pro/start_docker.go rename to cmd/platform/start_docker.go index 842de09884..268de41fa9 100644 --- a/cmd/pro/start_docker.go +++ b/cmd/platform/start_docker.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "bytes" diff --git a/cmd/pro/start_docker_test.go b/cmd/platform/start_docker_test.go similarity index 99% rename from cmd/pro/start_docker_test.go rename to cmd/platform/start_docker_test.go index 10f785c96b..0448363f6d 100644 --- a/cmd/pro/start_docker_test.go +++ b/cmd/platform/start_docker_test.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" diff --git a/cmd/pro/start_flags.go b/cmd/platform/start_flags.go similarity index 97% rename from cmd/pro/start_flags.go rename to cmd/platform/start_flags.go index 37694603c8..98a5e98ce0 100644 --- a/cmd/pro/start_flags.go +++ b/cmd/platform/start_flags.go @@ -1,7 +1,7 @@ -package pro +package platform import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/start_reachability_test.go b/cmd/platform/start_reachability_test.go similarity index 99% rename from cmd/pro/start_reachability_test.go rename to cmd/platform/start_reachability_test.go index 0e1b26f052..b831424f95 100644 --- a/cmd/pro/start_reachability_test.go +++ b/cmd/platform/start_reachability_test.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" diff --git a/cmd/pro/start_test.go b/cmd/platform/start_test.go similarity index 99% rename from cmd/pro/start_test.go rename to cmd/platform/start_test.go index 8c47716046..90c0aec169 100644 --- a/cmd/pro/start_test.go +++ b/cmd/platform/start_test.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "os" diff --git a/cmd/pro/start_uninstall.go b/cmd/platform/start_uninstall.go similarity index 99% rename from cmd/pro/start_uninstall.go rename to cmd/platform/start_uninstall.go index 9d00f1f10f..0df233d26a 100644 --- a/cmd/pro/start_uninstall.go +++ b/cmd/platform/start_uninstall.go @@ -1,4 +1,4 @@ -package pro +package platform import ( "context" diff --git a/cmd/pro/template/list.go b/cmd/platform/template/list.go similarity index 95% rename from cmd/pro/template/list.go rename to cmd/platform/template/list.go index d33f99feae..68a23c9504 100644 --- a/cmd/pro/template/list.go +++ b/cmd/platform/template/list.go @@ -5,8 +5,8 @@ import ( "encoding/json" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/template/template.go b/cmd/platform/template/template.go similarity index 86% rename from cmd/pro/template/template.go rename to cmd/platform/template/template.go index 3d8e84da61..d70be775eb 100644 --- a/cmd/pro/template/template.go +++ b/cmd/platform/template/template.go @@ -1,7 +1,7 @@ package template import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/update_provider.go b/cmd/platform/update_provider.go similarity index 97% rename from cmd/pro/update_provider.go rename to cmd/platform/update_provider.go index 8ada3cdc61..fd98828ef8 100644 --- a/cmd/pro/update_provider.go +++ b/cmd/platform/update_provider.go @@ -1,12 +1,12 @@ -package pro +package platform import ( "context" "fmt" "strings" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" providercmd "github.com/devsy-org/devsy/cmd/provider" "github.com/devsy-org/devsy/pkg/config" provider2 "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/user/reset_password.go b/cmd/platform/user/reset_password.go similarity index 99% rename from cmd/pro/user/reset_password.go rename to cmd/platform/user/reset_password.go index 3315a4f15c..f0b462d13c 100644 --- a/cmd/pro/user/reset_password.go +++ b/cmd/platform/user/reset_password.go @@ -7,7 +7,7 @@ import ( "strings" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" "github.com/devsy-org/devsy/pkg/log" diff --git a/cmd/pro/user/user.go b/cmd/platform/user/user.go similarity index 86% rename from cmd/pro/user/user.go rename to cmd/platform/user/user.go index 8acb6cc821..77a7c2a809 100644 --- a/cmd/pro/user/user.go +++ b/cmd/platform/user/user.go @@ -1,7 +1,7 @@ package user import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/pro/version.go b/cmd/platform/version.go similarity index 90% rename from cmd/pro/version.go rename to cmd/platform/version.go index ceeaab92a2..542e115374 100644 --- a/cmd/pro/version.go +++ b/cmd/platform/version.go @@ -1,10 +1,10 @@ -package pro +package platform import ( "context" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" diff --git a/cmd/pro/workspace/create.go b/cmd/platform/workspace/create.go similarity index 94% rename from cmd/pro/workspace/create.go rename to cmd/platform/workspace/create.go index 2c728dbf9d..146126410a 100644 --- a/cmd/pro/workspace/create.go +++ b/cmd/platform/workspace/create.go @@ -4,8 +4,8 @@ package workspace import ( "context" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/workspace/import.go b/cmd/platform/workspace/import.go similarity index 98% rename from cmd/pro/workspace/import.go rename to cmd/platform/workspace/import.go index 5154113082..85e7704e23 100644 --- a/cmd/pro/workspace/import.go +++ b/cmd/platform/workspace/import.go @@ -7,8 +7,8 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/provider/list" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" + "github.com/devsy-org/devsy/cmd/platform/provider/list" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/workspace/list.go b/cmd/platform/workspace/list.go similarity index 95% rename from cmd/pro/workspace/list.go rename to cmd/platform/workspace/list.go index f4ecea34a1..b9e67769f8 100644 --- a/cmd/pro/workspace/list.go +++ b/cmd/platform/workspace/list.go @@ -6,8 +6,8 @@ import ( "time" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/workspace/rebuild.go b/cmd/platform/workspace/rebuild.go similarity index 98% rename from cmd/pro/workspace/rebuild.go rename to cmd/platform/workspace/rebuild.go index be2a33ed22..f1f7cd2203 100644 --- a/cmd/pro/workspace/rebuild.go +++ b/cmd/platform/workspace/rebuild.go @@ -8,7 +8,7 @@ import ( "os" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/workspace/sleep.go b/cmd/platform/workspace/sleep.go similarity index 99% rename from cmd/pro/workspace/sleep.go rename to cmd/platform/workspace/sleep.go index 4fb9ec6639..d3e1157c8a 100644 --- a/cmd/pro/workspace/sleep.go +++ b/cmd/platform/workspace/sleep.go @@ -9,7 +9,7 @@ import ( clusterv1 "github.com/devsy-org/agentapi/pkg/apis/devsy/cluster/v1" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/workspace/update.go b/cmd/platform/workspace/update.go similarity index 94% rename from cmd/pro/workspace/update.go rename to cmd/platform/workspace/update.go index 4741a9fc48..7dc76d13a8 100644 --- a/cmd/pro/workspace/update.go +++ b/cmd/platform/workspace/update.go @@ -4,8 +4,8 @@ package workspace import ( "context" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/workspace/wakeup.go b/cmd/platform/workspace/wakeup.go similarity index 98% rename from cmd/pro/workspace/wakeup.go rename to cmd/platform/workspace/wakeup.go index bba6e3b894..a00caa1670 100644 --- a/cmd/pro/workspace/wakeup.go +++ b/cmd/platform/workspace/wakeup.go @@ -9,7 +9,7 @@ import ( clusterv1 "github.com/devsy-org/agentapi/pkg/apis/devsy/cluster/v1" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" "github.com/devsy-org/devsy/pkg/flags/names" diff --git a/cmd/pro/workspace/watch.go b/cmd/platform/workspace/watch.go similarity index 96% rename from cmd/pro/workspace/watch.go rename to cmd/platform/workspace/watch.go index 23e9a520eb..afbda3ae7a 100644 --- a/cmd/pro/workspace/watch.go +++ b/cmd/platform/workspace/watch.go @@ -7,8 +7,8 @@ import ( "os/signal" "syscall" - "github.com/devsy-org/devsy/cmd/pro/cmdutil" - "github.com/devsy-org/devsy/cmd/pro/flags" + "github.com/devsy-org/devsy/cmd/platform/cmdutil" + "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/devsy-org/devsy/pkg/client/clientimplementation" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" diff --git a/cmd/pro/workspace/workspace.go b/cmd/platform/workspace/workspace.go similarity index 91% rename from cmd/pro/workspace/workspace.go rename to cmd/platform/workspace/workspace.go index 354bb39b98..ca689a5fd0 100644 --- a/cmd/pro/workspace/workspace.go +++ b/cmd/platform/workspace/workspace.go @@ -1,7 +1,7 @@ package workspace import ( - platformflags "github.com/devsy-org/devsy/cmd/pro/flags" + platformflags "github.com/devsy-org/devsy/cmd/platform/flags" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index 47ef5805b6..08aec9dcb8 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -22,7 +22,7 @@ import ( cmdinternal "github.com/devsy-org/devsy/cmd/internal" "github.com/devsy-org/devsy/cmd/machine" "github.com/devsy-org/devsy/cmd/mcp" - "github.com/devsy-org/devsy/cmd/pro" + "github.com/devsy-org/devsy/cmd/platform" "github.com/devsy-org/devsy/cmd/provider" secretscmd "github.com/devsy-org/devsy/cmd/secrets" snapshotcmd "github.com/devsy-org/devsy/cmd/snapshot" @@ -403,7 +403,7 @@ func registerSubcommands(rootCmd *cobra.Command, globalFlags *flags.GlobalFlags) cmdinternal.NewInternalCmd(globalFlags), ) if platformEnabled() { - rootCmd.AddCommand(pro.NewPlatformCmd(globalFlags)) + rootCmd.AddCommand(platform.NewPlatformCmd(globalFlags)) } } diff --git a/pkg/platform/form/form.go b/pkg/platform/form/form.go index c00f84c655..7f54fb4009 100644 --- a/pkg/platform/form/form.go +++ b/pkg/platform/form/form.go @@ -9,7 +9,7 @@ import ( "charm.land/huh/v2" managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - "github.com/devsy-org/devsy/cmd/pro/provider/list" + "github.com/devsy-org/devsy/cmd/platform/provider/list" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/encoding" "github.com/devsy-org/devsy/pkg/log"