Commita79aa64

authored

fix: Usecliui.WorkspaceBuild to prevent cancel of builds jobs (#1255)

Build jobs cannot gracefully terminate because Terraform generallycannot gracefully terminate.

1 parent7534328 commita79aa64Copy full SHA for a79aa64

File tree

-41

lines changed

-41

lines changed

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,18 +361,7 @@ func server() *cobra.Command {`
`361`	`361`	`returnxerrors.Errorf("delete workspace: %w",err)`
`362`	`362`	`}`
`363`	`363`
`364`		`-err=cliui.ProvisionerJob(cmd.Context(),cmd.OutOrStdout(), cliui.ProvisionerJobOptions{`
`365`		`-Fetch:func() (codersdk.ProvisionerJob,error) {`
`366`		`-build,err:=client.WorkspaceBuild(cmd.Context(),build.ID)`
`367`		`-returnbuild.Job,err`
`368`		`-},`
`369`		`-Cancel:func()error {`
`370`		`-returnclient.CancelWorkspaceBuild(cmd.Context(),build.ID)`
`371`		`-},`
`372`		`-Logs:func() (<-chan codersdk.ProvisionerJobLog,error) {`
`373`		`-returnclient.WorkspaceBuildLogsAfter(cmd.Context(),build.ID,before)`
`374`		`-},`
`375`		`-})`
	`364`	`+err=cliui.WorkspaceBuild(cmd.Context(),cmd.OutOrStdout(),client,build.ID,before)`
`376`	`365`	`iferr!=nil {`
`377`	`366`	`returnxerrors.Errorf("delete workspace %s: %w",workspace.Name,err)`
`378`	`367`	`}`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,19 +35,7 @@ func workspaceStart() *cobra.Command {`
`35`	`35`	`iferr!=nil {`
`36`	`36`	`returnerr`
`37`	`37`	`}`
`38`		`-err=cliui.ProvisionerJob(cmd.Context(),cmd.OutOrStdout(), cliui.ProvisionerJobOptions{`
`39`		`-Fetch:func() (codersdk.ProvisionerJob,error) {`
`40`		`-build,err:=client.WorkspaceBuild(cmd.Context(),build.ID)`
`41`		`-returnbuild.Job,err`
`42`		`-},`
`43`		`-Cancel:func()error {`
`44`		`-returnclient.CancelWorkspaceBuild(cmd.Context(),build.ID)`
`45`		`-},`
`46`		`-Logs:func() (<-chan codersdk.ProvisionerJobLog,error) {`
`47`		`-returnclient.WorkspaceBuildLogsAfter(cmd.Context(),build.ID,before)`
`48`		`-},`
`49`		`-})`
`50`		`-returnerr`
	`38`	`+returncliui.WorkspaceBuild(cmd.Context(),cmd.OutOrStdout(),client,build.ID,before)`
`51`	`39`	`},`
`52`	`40`	`}`
`53`	`41`	`}`

Lines changed: 1 addition & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,22 +35,7 @@ func workspaceStop() *cobra.Command {`
`35`	`35`	`iferr!=nil {`
`36`	`36`	`returnerr`
`37`	`37`	`}`
`38`		`-err=cliui.ProvisionerJob(cmd.Context(),cmd.OutOrStdout(), cliui.ProvisionerJobOptions{`
`39`		`-Fetch:func() (codersdk.ProvisionerJob,error) {`
`40`		`-build,err:=client.WorkspaceBuild(cmd.Context(),build.ID)`
`41`		`-returnbuild.Job,err`
`42`		`-},`
`43`		`-Cancel:func()error {`
`44`		`-returnclient.CancelWorkspaceBuild(cmd.Context(),build.ID)`
`45`		`-},`
`46`		`-Logs:func() (<-chan codersdk.ProvisionerJobLog,error) {`
`47`		`-returnclient.WorkspaceBuildLogsAfter(cmd.Context(),build.ID,before)`
`48`		`-},`
`49`		`-})`
`50`		`-iferr!=nil {`
`51`		`-returnerr`
`52`		`-}`
`53`		`-returnnil`
	`38`	`+returncliui.WorkspaceBuild(cmd.Context(),cmd.OutOrStdout(),client,build.ID,before)`
`54`	`39`	`},`
`55`	`40`	`}`
`56`	`41`	`}`

Comments

(0)