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
4 changes: 2 additions & 2 deletions cmd/workspace/up/up_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ func (cmd *UpCmd) checkProviderUpdate(
if cmd.Platform.Enabled {
return nil
}
proInstance := workspace2.GetProInstance(devsyConfig, client.Provider())
return workspace2.CheckProviderUpdate(ctx, devsyConfig, proInstance)
platformInstance := workspace2.GetPlatformInstance(devsyConfig, client.Provider())
return workspace2.CheckProviderUpdate(ctx, devsyConfig, platformInstance)
}

// ensureArgs returns args unchanged unless either --from-snapshot or --source is
Expand Down
5 changes: 3 additions & 2 deletions pkg/platform/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func (c *client) Login(host string, insecure bool) error {
msg += " --insecure"
}
msg += "'"
log.Infof(msg, host, pkgconfig.BinaryName+" pro login", host)
log.Infof(msg, host, pkgconfig.BinaryName+" platform login", host)
log.Infof("Logging into Devsy Platform")

key = <-keyChannel
Expand Down Expand Up @@ -491,7 +491,8 @@ func (c *client) restConfig(hostSuffix string) (*rest.Config, error) {
return nil, errors.New("no config loaded")
} else if c.config.Host == "" || c.config.AccessKey == "" {
return nil, errors.New(
"not logged in, run 'devsy pro start' or 'devsy pro login [devsy-pro-url]'",
"not logged in, run 'devsy platform start' or " +
"'devsy platform login [devsy-platform-url]'",
)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/workspace/provider_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ func sameProviderSource(a, b provider2.ProviderSource) bool {
return a == b
}

// GetProInstance returns the ProInstance associated with the given provider name, or nil if not found.
func GetProInstance(
// GetPlatformInstance returns the PlatformInstance associated with the given provider name, or nil if not found.
func GetPlatformInstance(
devsyConfig *config.Config,
providerName string,
) *provider2.PlatformInstance {
Expand Down
Loading