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 pkg/cmd/delete/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func handleAdminUser(err error, deleteStore DeleteStore) error {
if user.GlobalUserType != "Admin" {
return breverrors.WrapAndTrace(err)
}
fmt.Println("attempting to delete a workspace you don't own as admin")
fmt.Println("attempting to delete an instance you don't own as admin")
return nil
}

Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/open/open.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ const (
)

var (
openLong = "[command in beta] This will open VS Code or Cursor SSH-ed in to your workspace. You must have the editor installed in your path."
openExample = "brev open workspace_id_or_name\nbrev open my-app\nbrev open my-app code\nbrev open my-app cursor\nbrev open --set-default cursor"
openLong = "[command in beta] This will open VS Code or Cursor SSH-ed in to your instance. You must have the editor installed in your path."
openExample = "brev open instance_id_or_name\nbrev open instance\nbrev open instance code\nbrev open instance cursor\nbrev open --set-default cursor"
)

type OpenStore interface {
Expand All @@ -62,7 +62,7 @@ func NewCmdOpen(t *terminal.Terminal, store OpenStore, noLoginStartStore OpenSto
Annotations: map[string]string{"ssh": ""},
Use: "open",
DisableFlagsInUseLine: true,
Short: "[beta] open VSCode or Cursor to your workspace",
Short: "[beta] open VSCode or Cursor to your instance",
Long: openLong,
Example: openExample,
Args: cmderrors.TransformToValidationError(func(cmd *cobra.Command, args []string) error {
Expand Down Expand Up @@ -267,9 +267,9 @@ func pollUntil(t *terminal.Terminal, wsid string, state string, openStore OpenSt
if err != nil {
return breverrors.WrapAndTrace(err)
}
s.Suffix = " workspace is currently " + strings.ToLower(ws.Status)
s.Suffix = " instance is currently " + strings.ToLower(ws.Status)
if ws.Status == state {
s.Suffix = "Workspace is ready!"
s.Suffix = "Instance is ready!"
s.Stop()
isReady = true
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/recreate/recreate.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func hardResetCreateEmptyWorkspace(t *terminal.Terminal, recreateStore recreateS

// ensure name
if len(workspace.Name) == 0 {
return breverrors.NewValidationError("name field is required for empty workspaces")
return breverrors.NewValidationError("name field is required for empty instances")
}

// ensure org
Expand Down Expand Up @@ -197,9 +197,9 @@ func pollUntil(t *terminal.Terminal, wsid string, state string, recreateStore re
if err != nil {
return breverrors.WrapAndTrace(err)
}
s.Suffix = " workspace is " + strings.ToLower(ws.Status)
s.Suffix = " instance is " + strings.ToLower(ws.Status)
if ws.Status == state {
s.Suffix = "Workspace is ready!"
s.Suffix = "Instance is ready!"
s.Stop()
isReady = true
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/reset/reset.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ func pollUntil(t *terminal.Terminal, wsid string, state string, resetStore Reset
if err != nil {
return breverrors.WrapAndTrace(err)
}
s.Suffix = " workspace is " + strings.ToLower(ws.Status)
s.Suffix = " instance is " + strings.ToLower(ws.Status)
if ws.Status == state {
s.Suffix = "Workspace is ready!"
s.Suffix = "Instance is ready!"
s.Stop()
isReady = true
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/shell/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
)

var (
openLong = "[command in beta] This will shell in to your workspace"
openExample = "brev shell workspace_id_or_name\nbrev shell my-app\nbrev open h9fp5vxwe"
openLong = "[command in beta] This will shell in to your instance"
openExample = "brev shell instance_id_or_name\nbrev shell instance\nbrev open h9fp5vxwe"
)

type ShellStore interface {
Expand Down Expand Up @@ -92,7 +92,7 @@ func runShellCommand(t *terminal.Terminal, sstore ShellStore, workspaceNameOrID,
return breverrors.WrapAndTrace(err)
}
if workspace.Status != "RUNNING" {
return breverrors.New("Workspace is not running")
return breverrors.New("Instance is not running")
}

localIdentifier := workspace.GetLocalIdentifier()
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/stop/stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewCmdStop(t *terminal.Terminal, loginStopStore StopStore, noLoginStopStore
return stopAllWorkspaces(t, loginStopStore)
} else {
if len(args) == 0 {
return breverrors.NewValidationError("please provide a workspace to stop")
return breverrors.NewValidationError("please provide an instance to stop")
}
var allErr error
for _, arg := range args {
Expand All @@ -63,7 +63,7 @@ func NewCmdStop(t *terminal.Terminal, loginStopStore StopStore, noLoginStopStore
return nil
},
}
cmd.Flags().BoolVarP(&all, "all", "a", false, "stop all workspaces")
cmd.Flags().BoolVarP(&all, "all", "a", false, "stop all instances")

return cmd
}
Expand Down
Loading