From a1426c22fa3a17a31ab008b15320070d3dcb12f4 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Fri, 23 Oct 2026 01:00:34 -0600 Subject: [PATCH] refactor(cmd): rename proutil package to cmdutil --- cmd/pro/check_update.go | 8 ++++---- cmd/pro/cluster/list.go | 8 ++++---- cmd/pro/{proutil/proutil.go => cmdutil/cmdutil.go} | 4 ++-- .../{proutil/proutil_test.go => cmdutil/cmdutil_test.go} | 2 +- cmd/pro/daemon/netcheck.go | 8 ++++---- cmd/pro/daemon/start.go | 6 +++--- cmd/pro/daemon/status.go | 8 ++++---- cmd/pro/health.go | 8 ++++---- cmd/pro/project/list.go | 8 ++++---- cmd/pro/self.go | 6 +++--- cmd/pro/template/list.go | 8 ++++---- cmd/pro/update_provider.go | 4 ++-- cmd/pro/version.go | 6 +++--- cmd/pro/workspace/create.go | 4 ++-- cmd/pro/workspace/list.go | 6 +++--- cmd/pro/workspace/update.go | 4 ++-- cmd/pro/workspace/watch.go | 4 ++-- 17 files changed, 51 insertions(+), 51 deletions(-) rename cmd/pro/{proutil/proutil.go => cmdutil/cmdutil.go} (97%) rename cmd/pro/{proutil/proutil_test.go => cmdutil/cmdutil_test.go} (99%) diff --git a/cmd/pro/check_update.go b/cmd/pro/check_update.go index a32b2e743e..2b947f153a 100644 --- a/cmd/pro/check_update.go +++ b/cmd/pro/check_update.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/platform" "github.com/devsy-org/devsy/pkg/provider" @@ -32,10 +32,10 @@ func NewCheckUpdateCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Short: "Check platform provider update", Hidden: true, Annotations: telemetry.SkipInUIAnnotation(), - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), - PersistentPreRun: proutil.MarkAgentExecuted, + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + PersistentPreRun: cmdutil.MarkAgentExecuted, } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) return c } diff --git a/cmd/pro/cluster/list.go b/cmd/pro/cluster/list.go index 863fa5b640..435b9cde13 100644 --- a/cmd/pro/cluster/list.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -34,9 +34,9 @@ func NewListCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Use: "list", Short: "List clusters", Hidden: true, - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) cliflags.Add(c, cliflags.String(&cmd.Project, names.Project, "", "The project to use")) _ = c.MarkFlagRequired(names.Project) flags.BindEnv(c.Flags(), names.Project) @@ -49,7 +49,7 @@ func (cmd *ListClustersCmd) Run( devsyConfig *config.Config, provider *provider.ProviderConfig, ) error { - headers := []string{proutil.HeaderName, proutil.HeaderDisplayName, "Online"} + headers := []string{cmdutil.HeaderName, cmdutil.HeaderDisplayName, "Online"} return proxycmd.RunAndPrintTable(ctx, proxycmd.Options{ Command: provider.Exec.Proxy.List.Clusters, diff --git a/cmd/pro/proutil/proutil.go b/cmd/pro/cmdutil/cmdutil.go similarity index 97% rename from cmd/pro/proutil/proutil.go rename to cmd/pro/cmdutil/cmdutil.go index 4e244dca1f..c7b700addd 100644 --- a/cmd/pro/proutil/proutil.go +++ b/cmd/pro/cmdutil/cmdutil.go @@ -1,7 +1,7 @@ -// Package proutil contains shared helpers used by the 'devsy platform' command and +// 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. -package proutil +package cmdutil import ( "context" diff --git a/cmd/pro/proutil/proutil_test.go b/cmd/pro/cmdutil/cmdutil_test.go similarity index 99% rename from cmd/pro/proutil/proutil_test.go rename to cmd/pro/cmdutil/cmdutil_test.go index e0d3785538..8b59f3bac2 100644 --- a/cmd/pro/proutil/proutil_test.go +++ b/cmd/pro/cmdutil/cmdutil_test.go @@ -1,4 +1,4 @@ -package proutil +package cmdutil import ( "context" diff --git a/cmd/pro/daemon/netcheck.go b/cmd/pro/daemon/netcheck.go index 21376785f7..93dc2b10f9 100644 --- a/cmd/pro/daemon/netcheck.go +++ b/cmd/pro/daemon/netcheck.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" proflags "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/config" daemon "github.com/devsy-org/devsy/pkg/daemon/platform" providerpkg "github.com/devsy-org/devsy/pkg/provider" @@ -31,10 +31,10 @@ func NewNetcheckCmd(flags *proflags.GlobalFlags) *cobra.Command { c := &cobra.Command{ Use: "netcheck", Short: "Get the status of the current network", - RunE: proutil.HostRunE(flags, &cmd.Host, cmd.Run), - PersistentPreRun: proutil.MarkAgentExecuted, + RunE: cmdutil.HostRunE(flags, &cmd.Host, cmd.Run), + PersistentPreRun: cmdutil.MarkAgentExecuted, } - proutil.AddHostFlag(c, &cmd.Host, proutil.WithHostCompletion(flags)) + cmdutil.AddHostFlag(c, &cmd.Host, cmdutil.WithHostCompletion(flags)) return c } diff --git a/cmd/pro/daemon/start.go b/cmd/pro/daemon/start.go index b3c2fbb14a..92d274766a 100644 --- a/cmd/pro/daemon/start.go +++ b/cmd/pro/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" proflags "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/config" daemon "github.com/devsy-org/devsy/pkg/daemon/platform" "github.com/devsy-org/devsy/pkg/log" @@ -35,9 +35,9 @@ func NewStartCmd(flags *proflags.GlobalFlags) *cobra.Command { c := &cobra.Command{ Use: "start", Short: "Start the client daemon", - RunE: proutil.HostRunE(flags, &cmd.Host, cmd.Run), + RunE: cmdutil.HostRunE(flags, &cmd.Host, cmd.Run), } - proutil.AddHostFlag(c, &cmd.Host, proutil.WithHostCompletion(flags)) + cmdutil.AddHostFlag(c, &cmd.Host, cmdutil.WithHostCompletion(flags)) return c } diff --git a/cmd/pro/daemon/status.go b/cmd/pro/daemon/status.go index 75d32d67ac..141f909109 100644 --- a/cmd/pro/daemon/status.go +++ b/cmd/pro/daemon/status.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" proflags "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/config" platformdaemon "github.com/devsy-org/devsy/pkg/daemon/platform" providerpkg "github.com/devsy-org/devsy/pkg/provider" @@ -28,10 +28,10 @@ func NewStatusCmd(flags *proflags.GlobalFlags) *cobra.Command { c := &cobra.Command{ Use: "status", Short: "Get the status of the daemon", - RunE: proutil.HostRunE(flags, &cmd.Host, cmd.Run), - PersistentPreRun: proutil.MarkAgentExecuted, + RunE: cmdutil.HostRunE(flags, &cmd.Host, cmd.Run), + PersistentPreRun: cmdutil.MarkAgentExecuted, } - proutil.AddHostFlag(c, &cmd.Host, proutil.WithHostCompletion(flags)) + cmdutil.AddHostFlag(c, &cmd.Host, cmdutil.WithHostCompletion(flags)) return c } diff --git a/cmd/pro/health.go b/cmd/pro/health.go index e9ab5364f9..3fa821623c 100644 --- a/cmd/pro/health.go +++ b/cmd/pro/health.go @@ -3,8 +3,8 @@ package pro import ( "context" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" @@ -29,10 +29,10 @@ func NewHealthCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Short: "Check platform health", Hidden: true, Annotations: telemetry.SkipInUIAnnotation(), - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), - PersistentPreRun: proutil.MarkAgentExecuted, + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + PersistentPreRun: cmdutil.MarkAgentExecuted, } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) return c } diff --git a/cmd/pro/project/list.go b/cmd/pro/project/list.go index b60aa3d573..e0b54f8628 100644 --- a/cmd/pro/project/list.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" @@ -29,9 +29,9 @@ func NewListCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Use: "list", Short: "List projects", Hidden: true, - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) return c } @@ -41,7 +41,7 @@ func (cmd *ListProjectsCmd) Run( devsyConfig *config.Config, provider *provider.ProviderConfig, ) error { - headers := []string{proutil.HeaderName, proutil.HeaderDisplayName, "Description"} + headers := []string{cmdutil.HeaderName, cmdutil.HeaderDisplayName, "Description"} return proxycmd.RunAndPrintTable(ctx, proxycmd.Options{ Command: provider.Exec.Proxy.List.Projects, diff --git a/cmd/pro/self.go b/cmd/pro/self.go index e93cff2e22..a708818ed8 100644 --- a/cmd/pro/self.go +++ b/cmd/pro/self.go @@ -3,8 +3,8 @@ package pro import ( "context" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" @@ -27,9 +27,9 @@ func NewSelfCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Use: "self", Short: "Get self", Hidden: true, - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) return c } diff --git a/cmd/pro/template/list.go b/cmd/pro/template/list.go index 22b3f13332..d33f99feae 100644 --- a/cmd/pro/template/list.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -33,9 +33,9 @@ func NewListCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Use: "list", Short: "List templates", Hidden: true, - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) cliflags.Add(c, cliflags.String(&cmd.Project, names.Project, "", "The project to use")) _ = c.MarkFlagRequired(names.Project) flags.BindEnv(c.Flags(), names.Project) @@ -48,7 +48,7 @@ func (cmd *ListTemplatesCmd) Run( devsyConfig *config.Config, provider *provider.ProviderConfig, ) error { - headers := []string{proutil.HeaderName, proutil.HeaderDisplayName, "Description"} + headers := []string{cmdutil.HeaderName, cmdutil.HeaderDisplayName, "Description"} return proxycmd.RunAndPrintTable(ctx, proxycmd.Options{ Command: provider.Exec.Proxy.List.Templates, diff --git a/cmd/pro/update_provider.go b/cmd/pro/update_provider.go index c3e5e97caa..996f7cc3ef 100644 --- a/cmd/pro/update_provider.go +++ b/cmd/pro/update_provider.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" providercmd "github.com/devsy-org/devsy/cmd/provider" "github.com/devsy-org/devsy/pkg/config" provider2 "github.com/devsy-org/devsy/pkg/provider" @@ -36,7 +36,7 @@ func NewUpdateProviderCmd(globalFlags *flags.GlobalFlags) *cobra.Command { }, } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) return c } diff --git a/cmd/pro/version.go b/cmd/pro/version.go index 9dbad9084d..ceeaab92a2 100644 --- a/cmd/pro/version.go +++ b/cmd/pro/version.go @@ -3,8 +3,8 @@ package pro import ( "context" + "github.com/devsy-org/devsy/cmd/pro/cmdutil" "github.com/devsy-org/devsy/cmd/pro/flags" - "github.com/devsy-org/devsy/cmd/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" "github.com/devsy-org/devsy/pkg/provider" @@ -27,9 +27,9 @@ func NewVersionCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Use: "version", Short: "Get version", Hidden: true, - RunE: proutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), + RunE: cmdutil.HostRunE(globalFlags, &cmd.Host, cmd.Run), } - proutil.AddHostFlag(c, &cmd.Host) + cmdutil.AddHostFlag(c, &cmd.Host) return c } diff --git a/cmd/pro/workspace/create.go b/cmd/pro/workspace/create.go index 38692c3f1a..2c728dbf9d 100644 --- a/cmd/pro/workspace/create.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -33,7 +33,7 @@ func NewCreateCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Short: "Create workspace instance", Hidden: true, RunE: func(cobraCmd *cobra.Command, args []string) error { - devsyConfig, provider, err := proutil.FindPlatformProvider( + devsyConfig, provider, err := cmdutil.FindPlatformProvider( cobraCmd.Context(), cmd.Context, cmd.Provider, diff --git a/cmd/pro/workspace/list.go b/cmd/pro/workspace/list.go index 95179c7375..f4ecea34a1 100644 --- a/cmd/pro/workspace/list.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -33,7 +33,7 @@ func NewListCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Short: "List Workspaces", Hidden: true, RunE: func(cobraCmd *cobra.Command, args []string) error { - devsyConfig, providerConfig, err := proutil.FindPlatformProvider( + devsyConfig, providerConfig, err := cmdutil.FindPlatformProvider( cobraCmd.Context(), cmd.Context, cmd.Provider, @@ -59,7 +59,7 @@ func (cmd *ListWorkspacesCmd) Run( devsyConfig *config.Config, provider *provider.ProviderConfig, ) error { - headers := []string{proutil.HeaderName, proutil.HeaderDisplayName, "Project", "Age"} + headers := []string{cmdutil.HeaderName, cmdutil.HeaderDisplayName, "Project", "Age"} return proxycmd.RunAndPrintTable(ctx, proxycmd.Options{ Command: provider.Exec.Proxy.List.Workspaces, diff --git a/cmd/pro/workspace/update.go b/cmd/pro/workspace/update.go index 163b1403f2..4741a9fc48 100644 --- a/cmd/pro/workspace/update.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/proxycmd" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -33,7 +33,7 @@ func NewUpdateCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Short: "Update workspace instance", Hidden: true, RunE: func(cobraCmd *cobra.Command, args []string) error { - devsyConfig, provider, err := proutil.FindPlatformProvider( + devsyConfig, provider, err := cmdutil.FindPlatformProvider( cobraCmd.Context(), cmd.Context, cmd.Provider, diff --git a/cmd/pro/workspace/watch.go b/cmd/pro/workspace/watch.go index eefb3705b0..23e9a520eb 100644 --- a/cmd/pro/workspace/watch.go +++ b/cmd/pro/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/pro/proutil" "github.com/devsy-org/devsy/pkg/client/clientimplementation" "github.com/devsy-org/devsy/pkg/config" cliflags "github.com/devsy-org/devsy/pkg/flags" @@ -37,7 +37,7 @@ func NewWatchCmd(globalFlags *flags.GlobalFlags) *cobra.Command { Short: "Watch workspaces", Hidden: true, RunE: func(cobraCmd *cobra.Command, args []string) error { - devsyConfig, provider, err := proutil.FindPlatformProvider( + devsyConfig, provider, err := cmdutil.FindPlatformProvider( cobraCmd.Context(), cmd.Context, cmd.Provider,