mirror of
https://github.com/coder/coder.git
synced 2025-07-12 00:14:10 +00:00
feat(cli): start workspace in no-wait mode (#17087)
Fixes: https://github.com/coder/coder/issues/16408
This commit is contained in:
17
cli/start.go
17
cli/start.go
@ -17,6 +17,8 @@ func (r *RootCmd) start() *serpent.Command {
|
|||||||
var (
|
var (
|
||||||
parameterFlags workspaceParameterFlags
|
parameterFlags workspaceParameterFlags
|
||||||
bflags buildFlags
|
bflags buildFlags
|
||||||
|
|
||||||
|
noWait bool
|
||||||
)
|
)
|
||||||
|
|
||||||
client := new(codersdk.Client)
|
client := new(codersdk.Client)
|
||||||
@ -28,7 +30,15 @@ func (r *RootCmd) start() *serpent.Command {
|
|||||||
serpent.RequireNArgs(1),
|
serpent.RequireNArgs(1),
|
||||||
r.InitClient(client),
|
r.InitClient(client),
|
||||||
),
|
),
|
||||||
Options: serpent.OptionSet{cliui.SkipPromptOption()},
|
Options: serpent.OptionSet{
|
||||||
|
{
|
||||||
|
Flag: "no-wait",
|
||||||
|
Description: "Return immediately after starting the workspace.",
|
||||||
|
Value: serpent.BoolOf(&noWait),
|
||||||
|
Hidden: false,
|
||||||
|
},
|
||||||
|
cliui.SkipPromptOption(),
|
||||||
|
},
|
||||||
Handler: func(inv *serpent.Invocation) error {
|
Handler: func(inv *serpent.Invocation) error {
|
||||||
workspace, err := namedWorkspace(inv.Context(), client, inv.Args[0])
|
workspace, err := namedWorkspace(inv.Context(), client, inv.Args[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -80,6 +90,11 @@ func (r *RootCmd) start() *serpent.Command {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if noWait {
|
||||||
|
_, _ = fmt.Fprintf(inv.Stdout, "The %s workspace has been started in no-wait mode. Workspace is building in the background.\n", cliui.Keyword(workspace.Name))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
err = cliui.WorkspaceBuild(inv.Context(), inv.Stdout, client, build.ID)
|
err = cliui.WorkspaceBuild(inv.Context(), inv.Stdout, client, build.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -441,3 +441,36 @@ func TestStart_Starting(t *testing.T) {
|
|||||||
|
|
||||||
_ = testutil.RequireRecvCtx(ctx, t, doneChan)
|
_ = testutil.RequireRecvCtx(ctx, t, doneChan)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStart_NoWait(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
ctx := testutil.Context(t, testutil.WaitShort)
|
||||||
|
|
||||||
|
// Prepare user, template, workspace
|
||||||
|
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
|
||||||
|
owner := coderdtest.CreateFirstUser(t, client)
|
||||||
|
member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
|
||||||
|
version1 := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
|
||||||
|
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID)
|
||||||
|
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version1.ID)
|
||||||
|
workspace := coderdtest.CreateWorkspace(t, member, template.ID)
|
||||||
|
coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
|
||||||
|
|
||||||
|
// Stop the workspace
|
||||||
|
build := coderdtest.CreateWorkspaceBuild(t, member, workspace, database.WorkspaceTransitionStop)
|
||||||
|
coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID)
|
||||||
|
|
||||||
|
// Start in no-wait mode
|
||||||
|
inv, root := clitest.New(t, "start", workspace.Name, "--no-wait")
|
||||||
|
clitest.SetupConfig(t, member, root)
|
||||||
|
doneChan := make(chan struct{})
|
||||||
|
pty := ptytest.New(t).Attach(inv)
|
||||||
|
go func() {
|
||||||
|
defer close(doneChan)
|
||||||
|
err := inv.Run()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
}()
|
||||||
|
|
||||||
|
pty.ExpectMatch("workspace has been started in no-wait mode")
|
||||||
|
_ = testutil.RequireRecvCtx(ctx, t, doneChan)
|
||||||
|
}
|
||||||
|
3
cli/testdata/coder_start_--help.golden
vendored
3
cli/testdata/coder_start_--help.golden
vendored
@ -22,6 +22,9 @@ OPTIONS:
|
|||||||
Set the value of ephemeral parameters defined in the template. The
|
Set the value of ephemeral parameters defined in the template. The
|
||||||
format is "name=value".
|
format is "name=value".
|
||||||
|
|
||||||
|
--no-wait bool
|
||||||
|
Return immediately after starting the workspace.
|
||||||
|
|
||||||
--parameter string-array, $CODER_RICH_PARAMETER
|
--parameter string-array, $CODER_RICH_PARAMETER
|
||||||
Rich parameter value in the format "name=value".
|
Rich parameter value in the format "name=value".
|
||||||
|
|
||||||
|
8
docs/reference/cli/start.md
generated
8
docs/reference/cli/start.md
generated
@ -11,6 +11,14 @@ coder start [flags] <workspace>
|
|||||||
|
|
||||||
## Options
|
## Options
|
||||||
|
|
||||||
|
### --no-wait
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|------|-------------------|
|
||||||
|
| Type | <code>bool</code> |
|
||||||
|
|
||||||
|
Return immediately after starting the workspace.
|
||||||
|
|
||||||
### -y, --yes
|
### -y, --yes
|
||||||
|
|
||||||
| | |
|
| | |
|
||||||
|
Reference in New Issue
Block a user