Skip to content

refactor(cmd): rename proutil package to cmdutil #1672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skevetter merged 1 commit into from
Oct 23, 2026
Merged

refactor(cmd): rename proutil package to cmdutil #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/pro/check_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/pro/cluster/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/proutil/proutil.go → cmd/pro/cmdutil/cmdutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/proutil/proutil_test.go → cmd/pro/cmdutil/cmdutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package proutil
package cmdutil

import (
"context"
Expand Down
8 changes: 4 additions & 4 deletions cmd/pro/daemon/netcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/daemon/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/pro/daemon/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/pro/health.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/pro/project/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/self.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/pro/template/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/update_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -36,7 +36,7 @@ func NewUpdateProviderCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
},
}

proutil.AddHostFlag(c, &cmd.Host)
cmdutil.AddHostFlag(c, &cmd.Host)

return c
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/workspace/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/workspace/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/workspace/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/workspace/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
Loading