Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/cluster/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/cluster/add_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion cmd/pro/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions cmd/pro/proutil/proutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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 }
}
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
2 changes: 1 addition & 1 deletion cmd/pro/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/rebuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/sleep.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/wakeup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 4 additions & 2 deletions cmd/provider/rename.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cmd/workspace/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -121,6 +121,6 @@ func printPlainWorkspaces(workspaces []*provider.Workspace) {
"IDE",
"Last Used",
"Age",
"Pro",
"Platform",
}, tableEntries)
}
2 changes: 1 addition & 1 deletion cmd/workspace/ping.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmd/workspace/troubleshoot.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientimplementation/daemonclient/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/platform/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Loading