Commitc33f9b9

committed

confirm before stop

1 parent31ff27d commitc33f9b9Copy full SHA for c33f9b9

File tree

+26

-9

lines changed

+26

-9

lines changed

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,22 @@ func (r RootCmd) update() serpent.Command {`
`39`	`39`	`// updating. Simply performing a new start transition may not work if the`
`40`	`40`	`// template specifies ignore_changes.`
`41`	`41`	`ifworkspace.LatestBuild.Transition==codersdk.WorkspaceTransitionStart {`
`42`		`-build,err:=stopWorkspace(inv,client,workspace,bflags)`
`43`		`-iferr!=nil {`
`44`		`-returnxerrors.Errorf("stop workspace: %w",err)`
`45`		`-}`
`46`		`-// Wait for the stop to complete.`
`47`		`-iferr:=cliui.WorkspaceBuild(inv.Context(),inv.Stdout,client,build.ID);err!=nil {`
`48`		`-returnxerrors.Errorf("wait for stop: %w",err)`
	`42`	`+// It's polite to ask the user before stopping their workspace.`
	`43`	`+cliui.Info(inv.Stdout,"Your workspace is currently running. We recommend stopping it before proceeding.")`
	`44`	`+if_,err:=cliui.Prompt(inv, cliui.PromptOptions{`
	`45`	`+Text:"Confirm stop workspace?",`
	`46`	`+IsConfirm:true,`
	`47`	`+});err!=nil {`
	`48`	`+cliui.Warnf(inv.Stderr,"Updating without stop.")`
	`49`	`+}else {`
	`50`	`+build,err:=stopWorkspace(inv,client,workspace,bflags)`
	`51`	`+iferr!=nil {`
	`52`	`+returnxerrors.Errorf("stop workspace: %w",err)`
	`53`	`+}`
	`54`	`+// Wait for the stop to complete.`
	`55`	`+iferr:=cliui.WorkspaceBuild(inv.Context(),inv.Stdout,client,build.ID);err!=nil {`
	`56`	`+returnxerrors.Errorf("wait for stop: %w",err)`
	`57`	`+}`
`49`	`58`	`}`
`50`	`59`	`}`
`51`	`60`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,16 @@ func TestUpdate(t *testing.T) {`
`71`	`71`	`inv,root:=clitest.New(t,"update",ws.Name)`
`72`	`72`	`clitest.SetupConfig(t,member,root)`
`73`	`73`
`74`		`-err=inv.Run()`
`75`		`-require.NoError(t,err,"update command failed")`
	`74`	`+doneCh:=make(chanerror)`
	`75`	`+pty:=ptytest.New(t).Attach(inv)`
	`76`	`+gofunc() {`
	`77`	`+deferclose(doneCh)`
	`78`	`+doneCh<-inv.Run()`
	`79`	`+}()`
	`80`	`+`
	`81`	`+pty.ExpectMatch("Confirm stop workspace?")`
	`82`	`+pty.WriteLine("yes")`
	`83`	`+require.NoError(t,testutil.TryReceive(ctx,t,doneCh),"update command failed to run")`
`76`	`84`
`77`	`85`	`// Then: the workspace is no longer 'outdated'`
`78`	`86`	`ws,err=member.WorkspaceByOwnerAndName(ctx,codersdk.Me,"my-workspace", codersdk.WorkspaceOptions{})`

Comments

(0)