From 53f3aa3ae0f7d3f074c95bfe7d11351f5ad79d30 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 20 Oct 2026 09:43:52 -0600 Subject: [PATCH 1/2] refactor(cmd): rename pro product text to platform in cmd/pro and workspace commands --- cmd/flags/flags.go | 2 +- cmd/pro/cluster/add.go | 6 +++--- cmd/pro/cluster/add_flags.go | 2 +- cmd/pro/cluster/cluster.go | 2 +- cmd/pro/project/project.go | 2 +- cmd/pro/proutil/proutil.go | 10 +++++----- cmd/pro/provider/up.go | 2 +- cmd/pro/template/template.go | 2 +- cmd/pro/user/user.go | 2 +- cmd/pro/workspace/create.go | 2 +- cmd/pro/workspace/list.go | 2 +- cmd/pro/workspace/rebuild.go | 2 +- cmd/pro/workspace/sleep.go | 2 +- cmd/pro/workspace/update.go | 2 +- cmd/pro/workspace/wakeup.go | 2 +- cmd/pro/workspace/watch.go | 2 +- cmd/pro/workspace/workspace.go | 2 +- cmd/provider/rename.go | 6 ++++-- cmd/workspace/list.go | 4 ++-- cmd/workspace/ping.go | 2 +- cmd/workspace/troubleshoot.go | 2 +- pkg/client/clientimplementation/daemonclient/up.go | 2 +- pkg/daemon/platform/error.go | 2 +- pkg/workspace/list.go | 4 ++-- 24 files changed, 35 insertions(+), 33 deletions(-) diff --git a/cmd/flags/flags.go b/cmd/flags/flags.go index 05edd74513..15cba104c9 100644 --- a/cmd/flags/flags.go +++ b/cmd/flags/flags.go @@ -98,7 +98,7 @@ func registerVerbosityFlags(flags *flag.FlagSet, globalFlags *GlobalFlags) { } func registerHiddenFlags(flags *flag.FlagSet, globalFlags *GlobalFlags) { - flags.Var(&globalFlags.Owner, names.Owner, "Show pro workspaces for owner") + flags.Var(&globalFlags.Owner, names.Owner, "Show platform workspaces for owner") _ = flags.MarkHidden(names.Owner) flags.StringVar(&globalFlags.UID, names.UID, "", "Set UID for workspace") _ = flags.MarkHidden(names.UID) diff --git a/cmd/pro/cluster/add.go b/cmd/pro/cluster/add.go index e7b9a1b08b..42c9669137 100644 --- a/cmd/pro/cluster/add.go +++ b/cmd/pro/cluster/add.go @@ -142,7 +142,7 @@ func (cmd *ClusterCmd) setupCluster( devsyVersion, err := baseClient.Version() if err != nil { - return clusterSetup{}, fmt.Errorf("get pro version: %w", err) + return clusterSetup{}, fmt.Errorf("get platform version: %w", err) } user, team := getUserOrTeam(baseClient) @@ -430,8 +430,8 @@ func ensureHost(devsyConfig *config.Config, host string) (string, error) { return "", fmt.Errorf("list platform instances: %w", err) } options := []string{} - for _, pro := range platformInstances { - options = append(options, pro.Host) + for _, instance := range platformInstances { + options = append(options, instance.Host) } h, err := log.QuestionDefault(&survey.QuestionOptions{ Question: "Select Platform instance to connect your cluster to", diff --git a/cmd/pro/cluster/add_flags.go b/cmd/pro/cluster/add_flags.go index 11decaadf1..acdcadd1b5 100644 --- a/cmd/pro/cluster/add_flags.go +++ b/cmd/pro/cluster/add_flags.go @@ -90,7 +90,7 @@ func (cmd *ClusterCmd) registerClusterFlags(c *cobra.Command) { "", "The kube context to use for installation", ), - cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use"), + cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use"), ) proflags.BindEnv(c.Flags(), names.Host) } diff --git a/cmd/pro/cluster/cluster.go b/cmd/pro/cluster/cluster.go index 935a68faf9..b15ba6ab77 100644 --- a/cmd/pro/cluster/cluster.go +++ b/cmd/pro/cluster/cluster.go @@ -6,7 +6,7 @@ import ( ) // NewClusterCmd builds the 'devsy pro cluster' parent command for managing -// Pro clusters. +// Platform clusters. func NewClusterCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "cluster", diff --git a/cmd/pro/project/project.go b/cmd/pro/project/project.go index 25270728b6..6d91ba3b38 100644 --- a/cmd/pro/project/project.go +++ b/cmd/pro/project/project.go @@ -6,7 +6,7 @@ import ( ) // NewProjectCmd builds the 'devsy pro project' parent command for managing -// Pro projects. +// Platform projects. func NewProjectCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "project", diff --git a/cmd/pro/proutil/proutil.go b/cmd/pro/proutil/proutil.go index 0cee58a2d0..b5cdb96957 100644 --- a/cmd/pro/proutil/proutil.go +++ b/cmd/pro/proutil/proutil.go @@ -17,14 +17,14 @@ import ( "github.com/spf13/cobra" ) -// Shared table headers used across pro resource listings. +// Shared table headers used across platform resource listings. const ( HeaderName = "Name" HeaderDisplayName = "Display Name" ) // FindPlatformProvider resolves the devsy config and provider config for the given -// pro host. +// platform host. func FindPlatformProvider( ctx context.Context, context, provider, host string, @@ -42,7 +42,7 @@ func FindPlatformProvider( return devsyConfig, pCfg, nil } -// HostRunFunc runs a host-scoped pro command with its resolved devsy config and +// HostRunFunc runs a host-scoped platform command with its resolved devsy config and // provider. type HostRunFunc func( ctx context.Context, @@ -83,7 +83,7 @@ type hostFlagOptions struct { // HostFlagOption configures AddHostFlag. type HostFlagOption func(*hostFlagOptions) -// WithHostCompletion registers shell completion for --host listing pro instances. +// WithHostCompletion registers shell completion for --host listing platform instances. func WithHostCompletion(globalFlags *proflags.GlobalFlags) HostFlagOption { return func(o *hostFlagOptions) { o.completionFlags = globalFlags } } @@ -96,7 +96,7 @@ func AddHostFlag(c *cobra.Command, dest *string, opts ...HostFlagOption) { opt(&o) } - cliflags.Add(c, cliflags.String(dest, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(dest, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) cliflags.BindEnv(c.Flags(), names.Host) diff --git a/cmd/pro/provider/up.go b/cmd/pro/provider/up.go index d3ebb47a3e..d3afc68594 100644 --- a/cmd/pro/provider/up.go +++ b/cmd/pro/provider/up.go @@ -155,5 +155,5 @@ func printInstanceInfo(instance *managementv1.DevsyWorkspaceInstance) { Template: instance.Spec.TemplateRef, Parameters: instance.Spec.Parameters, }) - log.Debugf("Starting pro workspace with configuration %s", string(workspaceConfig)) + log.Debugf("Starting platform workspace with configuration %s", string(workspaceConfig)) } diff --git a/cmd/pro/template/template.go b/cmd/pro/template/template.go index 8479ef408a..699b763fd2 100644 --- a/cmd/pro/template/template.go +++ b/cmd/pro/template/template.go @@ -6,7 +6,7 @@ import ( ) // NewTemplateCmd builds the 'devsy pro template' parent command for managing -// Pro templates. +// Platform templates. func NewTemplateCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "template", diff --git a/cmd/pro/user/user.go b/cmd/pro/user/user.go index 76634feda5..47ce294d22 100644 --- a/cmd/pro/user/user.go +++ b/cmd/pro/user/user.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" ) -// NewUserCmd builds the 'devsy pro user' parent command for managing Pro users. +// NewUserCmd builds the 'devsy pro user' parent command for managing Platform users. func NewUserCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "user", diff --git a/cmd/pro/workspace/create.go b/cmd/pro/workspace/create.go index d7d9bbc16b..38692c3f1a 100644 --- a/cmd/pro/workspace/create.go +++ b/cmd/pro/workspace/create.go @@ -47,7 +47,7 @@ func NewCreateCmd(globalFlags *flags.GlobalFlags) *cobra.Command { }, } - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) cliflags.Add( diff --git a/cmd/pro/workspace/list.go b/cmd/pro/workspace/list.go index 38a8aca918..95179c7375 100644 --- a/cmd/pro/workspace/list.go +++ b/cmd/pro/workspace/list.go @@ -47,7 +47,7 @@ func NewListCmd(globalFlags *flags.GlobalFlags) *cobra.Command { }, } - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) diff --git a/cmd/pro/workspace/rebuild.go b/cmd/pro/workspace/rebuild.go index 650baec6d8..2177862a64 100644 --- a/cmd/pro/workspace/rebuild.go +++ b/cmd/pro/workspace/rebuild.go @@ -42,7 +42,7 @@ func NewRebuildCmd(globalFlags *flags.GlobalFlags) *cobra.Command { cliflags.Add(c, cliflags.String(&cmd.Project, names.Project, "", "The project to use")) _ = c.MarkFlagRequired(names.Project) flags.BindEnv(c.Flags(), names.Project) - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) diff --git a/cmd/pro/workspace/sleep.go b/cmd/pro/workspace/sleep.go index c1abfc9080..2004df143c 100644 --- a/cmd/pro/workspace/sleep.go +++ b/cmd/pro/workspace/sleep.go @@ -59,7 +59,7 @@ func NewSleepCmd(globalFlags *flags.GlobalFlags) *cobra.Command { ) _ = c.MarkFlagRequired(names.Project) flags.BindEnv(c.Flags(), names.Project) - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) diff --git a/cmd/pro/workspace/update.go b/cmd/pro/workspace/update.go index 235f37ad3d..163b1403f2 100644 --- a/cmd/pro/workspace/update.go +++ b/cmd/pro/workspace/update.go @@ -47,7 +47,7 @@ func NewUpdateCmd(globalFlags *flags.GlobalFlags) *cobra.Command { }, } - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) cliflags.Add( diff --git a/cmd/pro/workspace/wakeup.go b/cmd/pro/workspace/wakeup.go index 114ff32f4c..bba6e3b894 100644 --- a/cmd/pro/workspace/wakeup.go +++ b/cmd/pro/workspace/wakeup.go @@ -47,7 +47,7 @@ func NewWakeupCmd(globalFlags *flags.GlobalFlags) *cobra.Command { cliflags.Add(c, cliflags.String(&cmd.Project, names.Project, "", "The project to use")) _ = c.MarkFlagRequired(names.Project) flags.BindEnv(c.Flags(), names.Project) - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) diff --git a/cmd/pro/workspace/watch.go b/cmd/pro/workspace/watch.go index 41463b58af..eefb3705b0 100644 --- a/cmd/pro/workspace/watch.go +++ b/cmd/pro/workspace/watch.go @@ -51,7 +51,7 @@ func NewWatchCmd(globalFlags *flags.GlobalFlags) *cobra.Command { }, } - cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The pro instance to use")) + cliflags.Add(c, cliflags.String(&cmd.Host, names.Host, "", "The platform instance to use")) _ = c.MarkFlagRequired(names.Host) flags.BindEnv(c.Flags(), names.Host) cliflags.Add(c, cliflags.String(&cmd.Project, names.Project, "", "The project to use")) diff --git a/cmd/pro/workspace/workspace.go b/cmd/pro/workspace/workspace.go index cc9a32eb08..38e3de53b9 100644 --- a/cmd/pro/workspace/workspace.go +++ b/cmd/pro/workspace/workspace.go @@ -6,7 +6,7 @@ import ( ) // NewWorkspaceCmd builds the 'devsy pro workspace' parent command for managing -// Pro workspaces. +// Platform workspaces. func NewWorkspaceCmd(globalFlags *proflags.GlobalFlags) *cobra.Command { cmd := &cobra.Command{ Use: "workspace", diff --git a/cmd/provider/rename.go b/cmd/provider/rename.go index 28322ee575..be2e909b3a 100644 --- a/cmd/provider/rename.go +++ b/cmd/provider/rename.go @@ -234,7 +234,7 @@ func (r *renameState) restoreProviderState(ctx context.Context) error { return errs } -// validateProviderRename verifies that the provider exists, is not a pro +// validateProviderRename verifies that the provider exists, is not a platform // provider, is not backing a platform instance, and has configuration state. func validateProviderRename(devsyConfig *config.Config, oldName string) error { providerWithOptions, err := workspace.FindProvider(devsyConfig, oldName) @@ -244,7 +244,9 @@ func validateProviderRename(devsyConfig *config.Config, oldName string) error { if providerWithOptions.Config.IsProxyProvider() || providerWithOptions.Config.IsDaemonProvider() { - return fmt.Errorf("cannot rename a pro provider; pro providers are managed by the platform") + return fmt.Errorf( + "cannot rename a platform provider; platform providers are managed by the platform", + ) } platformInstances, err := workspace.ListPlatformInstances(devsyConfig) diff --git a/cmd/workspace/list.go b/cmd/workspace/list.go index 1df87ae391..5f5aa1badb 100644 --- a/cmd/workspace/list.go +++ b/cmd/workspace/list.go @@ -43,7 +43,7 @@ func NewListCmd(globalFlags *flags.GlobalFlags) *cobra.Command { } cliflags.Add(listCmd, - cliflags.Bool(&cmd.SkipPro, names.SkipPro, false, "Don't list pro workspaces"), + cliflags.Bool(&cmd.SkipPro, names.SkipPro, false, "Don't list platform workspaces"), ) return listCmd } @@ -121,6 +121,6 @@ func printPlainWorkspaces(workspaces []*provider.Workspace) { "IDE", "Last Used", "Age", - "Pro", + "Platform", }, tableEntries) } diff --git a/cmd/workspace/ping.go b/cmd/workspace/ping.go index a492c4ac45..c6cca21dd6 100644 --- a/cmd/workspace/ping.go +++ b/cmd/workspace/ping.go @@ -63,7 +63,7 @@ func (cmd *PingCmd) Run(ctx context.Context, args []string) error { daemonClient, ok := client.(client2.DaemonClient) if !ok { - return fmt.Errorf("ping is only available for pro workspaces") + return fmt.Errorf("ping is only available for platform workspaces") } return daemonClient.Ping(ctx, os.Stdout) diff --git a/cmd/workspace/troubleshoot.go b/cmd/workspace/troubleshoot.go index af4ad916c8..6078429cd6 100644 --- a/cmd/workspace/troubleshoot.go +++ b/cmd/workspace/troubleshoot.go @@ -133,7 +133,7 @@ func (cmd *TroubleshootCmd) collectWorkspaceInfo( ctx, info.Config, info.Workspace, info.DevsyProInstances, ) if err != nil { - info.addErr("collect pro workspace info", err) + info.addErr("collect platform workspace info", err) } } diff --git a/pkg/client/clientimplementation/daemonclient/up.go b/pkg/client/clientimplementation/daemonclient/up.go index ec5c8f396c..86d2afc154 100644 --- a/pkg/client/clientimplementation/daemonclient/up.go +++ b/pkg/client/clientimplementation/daemonclient/up.go @@ -284,7 +284,7 @@ func printInstanceInfo(instance *managementv1.DevsyWorkspaceInstance) { Template: instance.Spec.TemplateRef, Parameters: instance.Spec.Parameters, }) - log.Debug("Starting pro workspace with configuration", string(workspaceConfig)) + log.Debug("Starting platform workspace with configuration", string(workspaceConfig)) } func observeTask( diff --git a/pkg/daemon/platform/error.go b/pkg/daemon/platform/error.go index 41c20135aa..e9deaecac8 100644 --- a/pkg/daemon/platform/error.go +++ b/pkg/daemon/platform/error.go @@ -16,7 +16,7 @@ type DaemonNotAvailableError struct { func (e *DaemonNotAvailableError) Error() string { return fmt.Sprintf( "The Devsy Daemon for provider %s isn't reachable. "+ - "Is Devsy Desktop or `devsy pro daemon start --host=$YOUR_PRO_HOST` running? %v", + "Is Devsy Desktop or `devsy pro daemon start --host=$YOUR_PLATFORM_HOST` running? %v", e.Provider, e.Err, ) diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go index 3d0ed1f0a2..bd186e4d1a 100644 --- a/pkg/workspace/list.go +++ b/pkg/workspace/list.go @@ -204,7 +204,7 @@ func listPlatformWorkspaces( } wg.Go(func() { - workspaces, err := listProWorkspacesForProvider( + workspaces, err := listPlatformWorkspacesForProvider( ctx, devsyConfig, provider, @@ -224,7 +224,7 @@ func listPlatformWorkspaces( return results } -func listProWorkspacesForProvider( +func listPlatformWorkspacesForProvider( ctx context.Context, devsyConfig *config.Config, provider string, From dbbe4dba2f33fe5eebe410867b2962c0239cc917 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 20 Oct 2026 09:47:15 -0600 Subject: [PATCH 2/2] refactor(workspace): revert list identifier rename to keep lint green --- pkg/workspace/list.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go index bd186e4d1a..3d0ed1f0a2 100644 --- a/pkg/workspace/list.go +++ b/pkg/workspace/list.go @@ -204,7 +204,7 @@ func listPlatformWorkspaces( } wg.Go(func() { - workspaces, err := listPlatformWorkspacesForProvider( + workspaces, err := listProWorkspacesForProvider( ctx, devsyConfig, provider, @@ -224,7 +224,7 @@ func listPlatformWorkspaces( return results } -func listPlatformWorkspacesForProvider( +func listProWorkspacesForProvider( ctx context.Context, devsyConfig *config.Config, provider string,