Commit5131129

committed

Revert "confirm before stop"

This reverts commitc33f9b9.

1 parent4476b6a commit5131129Copy full SHA for 5131129

File tree

-26

lines changed

-26

lines changed

Lines changed: 7 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,13 @@ 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`		`-// 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`		`-}`
	`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)`
`58`	`49`	`}`
`59`	`50`	`}`
`60`	`51`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,16 +71,8 @@ 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`		`-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")`
	`74`	`+err=inv.Run()`
	`75`	`+require.NoError(t,err,"update command failed")`
`84`	`76`
`85`	`77`	`// Then: the workspace is no longer 'outdated'`
`86`	`78`	`ws,err=member.WorkspaceByOwnerAndName(ctx,codersdk.Me,"my-workspace", codersdk.WorkspaceOptions{})`

Comments

(0)