diff --git a/cmd/pro/cluster/add.go b/cmd/pro/cluster/add.go index 9df04b4bc0..1d01ce3107 100644 --- a/cmd/pro/cluster/add.go +++ b/cmd/pro/cluster/add.go @@ -425,7 +425,7 @@ func ensureHost(devsyConfig *config.Config, host string) (string, error) { return host, nil } - proInstances, err := workspace.ListProInstances(devsyConfig) + proInstances, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return "", fmt.Errorf("list pro instances: %w", err) } diff --git a/cmd/pro/completion/suggestions.go b/cmd/pro/completion/suggestions.go index 9006e7b9f4..a60dd8964c 100644 --- a/cmd/pro/completion/suggestions.go +++ b/cmd/pro/completion/suggestions.go @@ -21,7 +21,7 @@ func GetPlatformHostSuggestions( return nil, cobra.ShellCompDirectiveError } - proInstances, err := workspace.ListProInstances(devsyConfig) + proInstances, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return nil, cobra.ShellCompDirectiveError } diff --git a/cmd/pro/list.go b/cmd/pro/list.go index 201e61d051..a13a8039c4 100644 --- a/cmd/pro/list.go +++ b/cmd/pro/list.go @@ -61,7 +61,7 @@ func (cmd *ListCmd) Run(ctx context.Context) error { return err } - proInstances, err := workspace.ListProInstances(devsyConfig) + proInstances, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return err } diff --git a/cmd/pro/login.go b/cmd/pro/login.go index a7c5ad87af..1eced745fa 100644 --- a/cmd/pro/login.go +++ b/cmd/pro/login.go @@ -199,7 +199,7 @@ func (cmd *LoginCmd) resolveInstance( return nil, nil, err } - proInstances, err := workspace.ListProInstances(devsyConfig) + proInstances, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return nil, nil, err } diff --git a/cmd/provider/delete.go b/cmd/provider/delete.go index 9b66832914..0861ac3513 100644 --- a/cmd/provider/delete.go +++ b/cmd/provider/delete.go @@ -103,7 +103,7 @@ func DeleteProvider( // if force is not set, check if the provider is associated with a pro instance or workspace if !force { // check if this provider is associated with a pro instance - proInstances, err := workspace.ListProInstances(devsyConfig) + proInstances, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return fmt.Errorf("list pro instances: %w", err) } diff --git a/cmd/provider/rename.go b/cmd/provider/rename.go index c4e2e63d9f..55ab564776 100644 --- a/cmd/provider/rename.go +++ b/cmd/provider/rename.go @@ -247,7 +247,7 @@ func validateProviderRename(devsyConfig *config.Config, oldName string) error { return fmt.Errorf("cannot rename a pro provider; pro providers are managed by the platform") } - proInstances, err := workspace.ListProInstances(devsyConfig) + proInstances, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return fmt.Errorf("listing pro instances: %w", err) } diff --git a/cmd/workspace/troubleshoot.go b/cmd/workspace/troubleshoot.go index b8275e33b1..99ceb95165 100644 --- a/cmd/workspace/troubleshoot.go +++ b/cmd/workspace/troubleshoot.go @@ -272,7 +272,7 @@ type DevsyProInstance struct { func collectPlatformInfo( devsyConfig *config.Config, ) ([]DevsyProInstance, error) { - proInstanceList, err := workspace.ListProInstances(devsyConfig) + proInstanceList, err := workspace.ListPlatformInstances(devsyConfig) if err != nil { return nil, fmt.Errorf("list pro instances: %w", err) } diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go index adcc5773bb..baa0b83c25 100644 --- a/pkg/workspace/list.go +++ b/pkg/workspace/list.go @@ -25,36 +25,36 @@ import ( func List( ctx context.Context, devsyConfig *config.Config, - skipPro bool, + skipPlatform bool, owner platform.OwnerFilter, ) ([]*providerpkg.Workspace, error) { // list local workspaces - localWorkspaces, err := ListLocalWorkspaces(devsyConfig.DefaultContext, skipPro) + localWorkspaces, err := ListLocalWorkspaces(devsyConfig.DefaultContext, skipPlatform) if err != nil { return nil, err } - proWorkspaces := []*providerpkg.Workspace{} - if !skipPro { - proWorkspaces, localWorkspaces = reconcileProWorkspaces( + platformWorkspaces := []*providerpkg.Workspace{} + if !skipPlatform { + platformWorkspaces, localWorkspaces = reconcilePlatformWorkspaces( ctx, devsyConfig, localWorkspaces, owner, ) } - return mergeWorkspaces(localWorkspaces, proWorkspaces), nil + return mergeWorkspaces(localWorkspaces, platformWorkspaces), nil } -func reconcileProWorkspaces( +func reconcilePlatformWorkspaces( ctx context.Context, devsyConfig *config.Config, localWorkspaces []*providerpkg.Workspace, owner platform.OwnerFilter, ) ([]*providerpkg.Workspace, []*providerpkg.Workspace) { - proWorkspaceResults := listProWorkspaces(ctx, devsyConfig, owner) + platformWorkspaceResults := listPlatformWorkspaces(ctx, devsyConfig, owner) - proWorkspaces := []*providerpkg.Workspace{} - for _, result := range proWorkspaceResults { - proWorkspaces = append(proWorkspaces, result.workspaces...) + platformWorkspaces := []*providerpkg.Workspace{} + for _, result := range platformWorkspaceResults { + platformWorkspaces = append(platformWorkspaces, result.workspaces...) } // Check if every local file based workspace has a remote counterpart. @@ -63,14 +63,14 @@ func reconcileProWorkspaces( cleanedLocalWorkspaces := []*providerpkg.Workspace{} for _, localWorkspace := range localWorkspaces { if localWorkspace.IsPro() && - shouldDeleteLocalWorkspace(ctx, localWorkspace, proWorkspaceResults) { + shouldDeleteLocalWorkspace(ctx, localWorkspace, platformWorkspaceResults) { deleteLocalWorkspace(devsyConfig, localWorkspace) continue } cleanedLocalWorkspaces = append(cleanedLocalWorkspaces, localWorkspace) } - return proWorkspaces, cleanedLocalWorkspaces + return platformWorkspaces, cleanedLocalWorkspaces } func deleteLocalWorkspace(devsyConfig *config.Config, localWorkspace *providerpkg.Workspace) { @@ -88,18 +88,18 @@ func deleteLocalWorkspace(devsyConfig *config.Config, localWorkspace *providerpk } func mergeWorkspaces( - localWorkspaces, proWorkspaces []*providerpkg.Workspace, + localWorkspaces, platformWorkspaces []*providerpkg.Workspace, ) []*providerpkg.Workspace { workspaces := map[string]*providerpkg.Workspace{} for _, workspace := range localWorkspaces { workspaces[workspace.UID] = workspace } - for _, proWorkspace := range proWorkspaces { - if localWorkspace, ok := workspaces[proWorkspace.UID]; ok { - proWorkspace.IDE = localWorkspace.IDE + for _, platformWorkspace := range platformWorkspaces { + if localWorkspace, ok := workspaces[platformWorkspace.UID]; ok { + platformWorkspace.IDE = localWorkspace.IDE } - workspaces[proWorkspace.UID] = proWorkspace + workspaces[platformWorkspace.UID] = platformWorkspace } retWorkspaces := []*providerpkg.Workspace{} @@ -112,7 +112,7 @@ func mergeWorkspaces( func ListLocalWorkspaces( contextName string, - skipPro bool, + skipPlatform bool, ) ([]*providerpkg.Workspace, error) { workspaceDir, err := providerpkg.GetWorkspacesDir(contextName) if err != nil { @@ -129,7 +129,7 @@ func ListLocalWorkspaces( if workspaceConfig := loadLocalWorkspaceEntry( contextName, entry.Name(), - skipPro, + skipPlatform, ); workspaceConfig != nil { retWorkspaces = append(retWorkspaces, workspaceConfig) } @@ -140,7 +140,7 @@ func ListLocalWorkspaces( func loadLocalWorkspaceEntry( contextName, name string, - skipPro bool, + skipPlatform bool, ) *providerpkg.Workspace { if strings.HasPrefix(name, ".") { return nil @@ -156,7 +156,7 @@ func loadLocalWorkspaceEntry( return nil } - if skipPro && workspaceConfig.IsPro() { + if skipPlatform && workspaceConfig.IsPro() { return nil } @@ -171,17 +171,17 @@ func CountLocalWorkspaces(contextName string) (int, error) { return len(workspaces), nil } -type listProWorkspacesResult struct { +type listPlatformWorkspacesResult struct { workspaces []*providerpkg.Workspace err error } -func listProWorkspaces( +func listPlatformWorkspaces( ctx context.Context, devsyConfig *config.Config, owner platform.OwnerFilter, -) map[string]listProWorkspacesResult { - results := map[string]listProWorkspacesResult{} +) map[string]listPlatformWorkspacesResult { + results := map[string]listPlatformWorkspacesResult{} // lock around `results` var mu sync.Mutex @@ -198,7 +198,7 @@ func listProWorkspaces( continue } - // only get pro providers + // only get platform providers if !providerConfig.IsProxyProvider() && !providerConfig.IsDaemonProvider() { continue } @@ -213,7 +213,7 @@ func listProWorkspaces( ) mu.Lock() defer mu.Unlock() - results[provider] = listProWorkspacesResult{ + results[provider] = listPlatformWorkspacesResult{ workspaces: workspaces, err: err, } @@ -231,7 +231,7 @@ func listProWorkspacesForProvider( providerConfig *providerpkg.ProviderConfig, owner platform.OwnerFilter, ) ([]*providerpkg.Workspace, error) { - instances, err := listProInstances(ctx, listProInstancesParams{ + instances, err := listPlatformInstances(ctx, listPlatformInstancesParams{ devsyConfig: devsyConfig, provider: provider, providerConfig: providerConfig, @@ -239,14 +239,14 @@ func listProWorkspacesForProvider( }) if err != nil { if log.DebugEnabled() { - log.Warnf("Failed to list pro workspaces for provider %s: %v", provider, err) + log.Warnf("Failed to list platform workspaces for provider %s: %v", provider, err) } return nil, err } retWorkspaces := []*providerpkg.Workspace{} for _, instance := range instances { - if workspace := proWorkspaceFromInstance( + if workspace := platformWorkspaceFromInstance( instance, provider, devsyConfig.DefaultContext, @@ -258,16 +258,16 @@ func listProWorkspacesForProvider( return retWorkspaces, nil } -type listProInstancesParams struct { +type listPlatformInstancesParams struct { devsyConfig *config.Config provider string providerConfig *providerpkg.ProviderConfig owner platform.OwnerFilter } -func listProInstances( +func listPlatformInstances( ctx context.Context, - params listProInstancesParams, + params listPlatformInstancesParams, ) ([]managementv1.DevsyWorkspaceInstance, error) { switch { case params.providerConfig.IsProxyProvider(): @@ -280,29 +280,29 @@ func listProInstances( case params.providerConfig.IsDaemonProvider(): return listInstancesDaemonProvider(ctx, params.provider, params.owner) default: - return nil, fmt.Errorf("cannot list pro workspaces with provider %s", params.provider) + return nil, fmt.Errorf("cannot list platform workspaces with provider %s", params.provider) } } -func proWorkspaceFromInstance( +func platformWorkspaceFromInstance( instance managementv1.DevsyWorkspaceInstance, provider string, defaultContext string, ) *providerpkg.Workspace { if instance.GetLabels() == nil { - log.Debugf("no labels for pro workspace %q found, skipping", instance.GetName()) + log.Debugf("no labels for platform workspace %q found, skipping", instance.GetName()) return nil } id := instance.GetLabels()[storagev1.DevsyWorkspaceIDLabel] if id == "" { - log.Debugf("no ID label for pro workspace %q found, skipping", instance.GetName()) + log.Debugf("no ID label for platform workspace %q found, skipping", instance.GetName()) return nil } uid := instance.GetLabels()[storagev1.DevsyWorkspaceUIDLabel] if uid == "" { - log.Debugf("no UID label for pro workspace %q found, skipping", instance.GetName()) + log.Debugf("no UID label for platform workspace %q found, skipping", instance.GetName()) return nil } @@ -310,12 +310,12 @@ func proWorkspaceFromInstance( ID: id, UID: uid, Context: defaultContext, - Source: proWorkspaceSource(instance), + Source: platformWorkspaceSource(instance), Provider: providerpkg.WorkspaceProviderConfig{ Name: provider, }, - LastUsedTimestamp: proWorkspaceLastUsed(instance), - CreationTimestamp: proWorkspaceCreationTimestamp(instance), + LastUsedTimestamp: platformWorkspaceLastUsed(instance), + CreationTimestamp: platformWorkspaceCreationTimestamp(instance), Pro: &providerpkg.ProMetadata{ InstanceName: instance.GetName(), Project: instance.GetLabels()[config.K8sProjectLabel], @@ -324,7 +324,7 @@ func proWorkspaceFromInstance( } } -func proWorkspaceSource( +func platformWorkspaceSource( instance managementv1.DevsyWorkspaceInstance, ) providerpkg.WorkspaceSource { source := providerpkg.WorkspaceSource{} @@ -342,7 +342,7 @@ func proWorkspaceSource( return *s } -func proWorkspaceLastUsed(instance managementv1.DevsyWorkspaceInstance) types.Time { +func platformWorkspaceLastUsed(instance managementv1.DevsyWorkspaceInstance) types.Time { if sleepModeConfig := instance.Status.SleepModeConfig; sleepModeConfig != nil { return types.Unix(sleepModeConfig.Status.LastActivity, 0) } @@ -363,7 +363,7 @@ func proWorkspaceLastUsed(instance managementv1.DevsyWorkspaceInstance) types.Ti return types.Unix(ts, 0) } -func proWorkspaceCreationTimestamp(instance managementv1.DevsyWorkspaceInstance) types.Time { +func platformWorkspaceCreationTimestamp(instance managementv1.DevsyWorkspaceInstance) types.Time { if instance.CreationTimestamp.IsZero() { return types.Time{} } @@ -373,10 +373,10 @@ func proWorkspaceCreationTimestamp(instance managementv1.DevsyWorkspaceInstance) func shouldDeleteLocalWorkspace( ctx context.Context, localWorkspace *providerpkg.Workspace, - proWorkspaceResults map[string]listProWorkspacesResult, + platformWorkspaceResults map[string]listPlatformWorkspacesResult, ) bool { // get the correct result for this local workspace - res, ok := proWorkspaceResults[localWorkspace.Provider.Name] + res, ok := platformWorkspaceResults[localWorkspace.Provider.Name] if !ok { return false } @@ -394,10 +394,13 @@ func shouldDeleteLocalWorkspace( } } - hasProCounterpart := slices.ContainsFunc(res.workspaces, func(w *providerpkg.Workspace) bool { - return localWorkspace.UID == w.UID - }) - return !hasProCounterpart + hasPlatformCounterpart := slices.ContainsFunc( + res.workspaces, + func(w *providerpkg.Workspace) bool { + return localWorkspace.UID == w.UID + }, + ) + return !hasPlatformCounterpart } func listInstancesProxyProvider( @@ -422,7 +425,7 @@ func listInstancesProxyProvider( Stderr: &stderr, }, ); err != nil { - return nil, fmt.Errorf("failed to list pro workspaces: %s: %w", stderr.String(), err) + return nil, fmt.Errorf("failed to list platform workspaces: %s: %w", stderr.String(), err) } if stdout.Len() == 0 { return nil, nil diff --git a/pkg/workspace/pro.go b/pkg/workspace/platform.go similarity index 50% rename from pkg/workspace/pro.go rename to pkg/workspace/platform.go index ffdd57ed2b..d1c15baf41 100644 --- a/pkg/workspace/pro.go +++ b/pkg/workspace/platform.go @@ -8,41 +8,41 @@ import ( provider2 "github.com/devsy-org/devsy/pkg/provider" ) -func ListProInstances( +func ListPlatformInstances( devsyConfig *config.Config, ) ([]*provider2.ProInstance, error) { - proInstanceDir, err := provider2.GetProInstancesDir(devsyConfig.DefaultContext) + platformInstanceDir, err := provider2.GetProInstancesDir(devsyConfig.DefaultContext) if err != nil { return nil, err } - entries, err := os.ReadDir(proInstanceDir) + entries, err := os.ReadDir(platformInstanceDir) if err != nil && !os.IsNotExist(err) { return nil, err } - retProInstances := []*provider2.ProInstance{} + retPlatformInstances := []*provider2.ProInstance{} for _, entry := range entries { - proInstanceConfig, err := provider2.LoadProInstanceConfig( + platformInstanceConfig, err := provider2.LoadProInstanceConfig( devsyConfig.DefaultContext, entry.Name(), ) if err != nil { - log.Warnf("could not load pro instance: instance=%s, error=%v", entry.Name(), err) + log.Warnf("could not load platform instance: instance=%s, error=%v", entry.Name(), err) continue } - retProInstances = append(retProInstances, proInstanceConfig) + retPlatformInstances = append(retPlatformInstances, platformInstanceConfig) } - return retProInstances, nil + return retPlatformInstances, nil } -func FindProviderProInstance( - proInstances []*provider2.ProInstance, +func FindProviderPlatformInstance( + platformInstances []*provider2.ProInstance, providerName string, ) (*provider2.ProInstance, bool) { - for _, instance := range proInstances { + for _, instance := range platformInstances { if instance.Provider == providerName { return instance, true } diff --git a/pkg/workspace/provider.go b/pkg/workspace/provider.go index ae75092990..e1c634ff4c 100644 --- a/pkg/workspace/provider.go +++ b/pkg/workspace/provider.go @@ -108,19 +108,22 @@ func FindProvider( func ProviderFromHost( ctx context.Context, devsyConfig *config.Config, - proHost string, + platformHost string, ) (*provider.ProviderConfig, error) { - proInstanceConfig, err := provider.LoadProInstanceConfig(devsyConfig.DefaultContext, proHost) + platformInstanceConfig, err := provider.LoadProInstanceConfig( + devsyConfig.DefaultContext, + platformHost, + ) if err != nil { - return nil, fmt.Errorf("load pro instance %s: %w", proHost, err) + return nil, fmt.Errorf("load platform instance %s: %w", platformHost, err) } - foundProvider, err := FindProvider(devsyConfig, proInstanceConfig.Provider) + foundProvider, err := FindProvider(devsyConfig, platformInstanceConfig.Provider) if err != nil { return nil, fmt.Errorf("find provider: %w", err) } if !foundProvider.Config.IsProxyProvider() && !foundProvider.Config.IsDaemonProvider() { - return nil, fmt.Errorf("provider is not a pro provider") + return nil, fmt.Errorf("provider is not a platform provider") } return foundProvider.Config, nil diff --git a/pkg/workspace/provider_update.go b/pkg/workspace/provider_update.go index 8255d76f18..b77cd08665 100644 --- a/pkg/workspace/provider_update.go +++ b/pkg/workspace/provider_update.go @@ -13,38 +13,42 @@ import ( "github.com/devsy-org/devsy/pkg/version" ) -// CheckProviderUpdate currently only ensures the local provider is in sync with the remote for Devsy Pro instances. +// CheckProviderUpdate only ensures the local provider is in sync with the remote for Devsy Platform instances. // Potentially auto-upgrade other providers in the future. func CheckProviderUpdate( ctx context.Context, devsyConfig *config.Config, - proInstance *provider2.ProInstance, + platformInstance *provider2.ProInstance, ) error { if version.GetVersion() == version.DevVersion { log.Debugf("skipping provider upgrade check during development") return nil } - if proInstance == nil { - log.Debug("no pro instance available, skipping provider upgrade check") + if platformInstance == nil { + log.Debug("no platform instance available, skipping provider upgrade check") return nil } - return checkProviderUpdateForInstance(ctx, devsyConfig, proInstance) + return checkProviderUpdateForInstance(ctx, devsyConfig, platformInstance) } func checkProviderUpdateForInstance( ctx context.Context, devsyConfig *config.Config, - proInstance *provider2.ProInstance, + platformInstance *provider2.ProInstance, ) error { - newVersion, err := platform.GetProInstanceDevsyVersion(proInstance) + newVersion, err := platform.GetProInstanceDevsyVersion(platformInstance) if err != nil { - return fmt.Errorf("version for pro instance %s: %w", proInstance.Host, err) + return fmt.Errorf("version for platform instance %s: %w", platformInstance.Host, err) } - p, err := FindProvider(devsyConfig, proInstance.Provider) + p, err := FindProvider(devsyConfig, platformInstance.Provider) if err != nil { - return fmt.Errorf("get provider config for pro provider %s: %w", proInstance.Provider, err) + return fmt.Errorf( + "get provider config for platform provider %s: %w", + platformInstance.Provider, + err, + ) } if shouldSkipProviderUpdate(p.Config.Version == version.DevVersion, p.Config.Source.Internal) { @@ -61,12 +65,12 @@ func checkProviderUpdateForInstance( log.Infof( "New provider version available, attempting to update %s from %s to %s", - proInstance.Provider, + platformInstance.Provider, p.Config.Version, newVersion, ) - return applyProviderUpdate(ctx, devsyConfig, proInstance.Provider, newVersion) + return applyProviderUpdate(ctx, devsyConfig, platformInstance.Provider, newVersion) } func providerVersionNeedsUpdate(newVersion, currentVersion string) (bool, error) { @@ -158,19 +162,19 @@ func GetProInstance( devsyConfig *config.Config, providerName string, ) *provider2.ProInstance { - proInstances, err := ListProInstances(devsyConfig) + platformInstances, err := ListPlatformInstances(devsyConfig) if err != nil { return nil - } else if len(proInstances) == 0 { + } else if len(platformInstances) == 0 { return nil } - proInstance, ok := FindProviderProInstance(proInstances, providerName) + platformInstance, ok := FindProviderPlatformInstance(platformInstances, providerName) if !ok { return nil } - return proInstance + return platformInstance } // shouldSkipProviderUpdate returns true if the provider update check should be skipped. diff --git a/pkg/workspace/rename.go b/pkg/workspace/rename.go index 6c524a2501..e78fa7d7f7 100644 --- a/pkg/workspace/rename.go +++ b/pkg/workspace/rename.go @@ -193,7 +193,7 @@ func Rename(ctx context.Context, opts RenameOptions) error { if wsConfig.IsPro() { return fmt.Errorf( - "cannot rename pro workspaces; pro workspaces are managed by the platform", + "cannot rename platform workspaces; they are managed by the platform", ) } diff --git a/pkg/workspace/workspace.go b/pkg/workspace/workspace.go index 687f3541fc..57837208c1 100644 --- a/pkg/workspace/workspace.go +++ b/pkg/workspace/workspace.go @@ -421,7 +421,7 @@ func provisionWorkspaceBacking( machineConfig, err := provisionManagedMachine(ctx, p) return p.workspace, machineConfig, err case p.provider.Config.IsProxyProvider() || p.provider.Config.IsDaemonProvider(): - updated, err := resolveProWorkspace(ctx, p.devsyConfig, p.provider, p.workspace) + updated, err := resolvePlatformWorkspace(ctx, p.devsyConfig, p.provider, p.workspace) return updated, nil, err default: machineConfig, err := saveAndLoadExistingMachine(p.provider, p.workspace) @@ -540,11 +540,11 @@ func cleanupMachineFolder(machineConfig *providerpkg.Machine, cause error) error return cause } -// resolveProWorkspace saves the workspace, hands provisioning to the remote pro -// process, and reloads the config it wrote back. The pro process renders its +// resolvePlatformWorkspace saves the workspace, hands provisioning to the remote platform +// process, and reloads the config it wrote back. The platform process renders its // form over os i/o and cannot call back into this process, so state is exchanged // through the workspace config file. -func resolveProWorkspace( +func resolvePlatformWorkspace( ctx context.Context, devsyConfig *config.Config, provider *ProviderWithOptions, @@ -554,7 +554,7 @@ func resolveProWorkspace( return nil, fmt.Errorf("save config: %w", err) } - err := resolveProInstance(proInstanceParams{ + err := resolvePlatformInstance(platformInstanceParams{ ctx: ctx, devsyConfig: devsyConfig, providerName: provider.Config.Name, @@ -715,7 +715,7 @@ func findLocalWorkspace( } // findWorkspace looks up a workspace among all known ones, marking a matching -// pro workspace as imported and persisting it locally. +// platform workspace as imported and persisting it locally. func findWorkspace( ctx context.Context, devsyConfig *config.Config, @@ -781,7 +781,7 @@ func selectWorkspace( return resolvedWorkspace{}, err } - sel, err := selectProWorkspace( + sel, err := selectPlatformWorkspace( devsyConfig, workspaces, selectedWorkspace, params, ) if err != nil { @@ -794,34 +794,34 @@ func selectWorkspace( return loadExistingWorkspace(devsyConfig, selectedWorkspace.ID, params.changeLastUsed) } -type proWorkspaceSelection struct { +type platformWorkspaceSelection struct { provider *providerpkg.ProviderConfig workspace *providerpkg.Workspace handled bool } -func selectProWorkspace( +func selectPlatformWorkspace( devsyConfig *config.Config, workspaces []*providerpkg.Workspace, selectedWorkspace *providerpkg.Workspace, params selectWorkspaceParams, -) (proWorkspaceSelection, error) { +) (platformWorkspaceSelection, error) { for _, workspace := range workspaces { if workspace.ID != selectedWorkspace.ID || !workspace.IsPro() { continue } - providerConfig, err := importSelectedProWorkspace(devsyConfig, workspace, params) + providerConfig, err := importSelectedPlatformWorkspace(devsyConfig, workspace, params) if err != nil { - return proWorkspaceSelection{}, err + return platformWorkspaceSelection{}, err } - return proWorkspaceSelection{ + return platformWorkspaceSelection{ provider: providerConfig, workspace: workspace, handled: true, }, nil } - return proWorkspaceSelection{}, nil + return platformWorkspaceSelection{}, nil } // listSelectableWorkspaces lists the candidate workspaces, most recently used @@ -880,7 +880,7 @@ func promptWorkspaceSelection(workspaces []*providerpkg.Workspace) (*providerpkg return selectedWorkspace, nil } -func importSelectedProWorkspace( +func importSelectedPlatformWorkspace( devsyConfig *config.Config, workspace *providerpkg.Workspace, params selectWorkspaceParams, @@ -947,7 +947,7 @@ func loadExistingWorkspace( }, nil } -type proInstanceParams struct { +type platformInstanceParams struct { ctx context.Context devsyConfig *config.Config providerName string @@ -957,7 +957,7 @@ type proInstanceParams struct { stderr io.Writer } -func resolveProInstance(params proInstanceParams) error { +func resolvePlatformInstance(params platformInstanceParams) error { foundProvider, err := FindProvider(params.devsyConfig, params.providerName) if err != nil { return err