Commitac86aa9

Aaron Lehmann

committed

Recreate REST client after starting a workspace

maybeWaitForRunning can take indefinitely long because it prompts forconfirmation, and in that time, client certificates can expire. Startsetup fresh after this call to make sure the REST client uses the latestcertificates.

1 parent4dd0d70 commitac86aa9Copy full SHA for ac86aa9

File tree

1 file changed

+11

-10

lines changed

src
- remote.ts

1 file changed

+11

-10

lines changed

`‎src/remote.ts‎`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,6 @@ export class Remote {`
`56`	`56`	`label:string,`
`57`	`57`	`binPath:string,`
`58`	`58`	`):Promise<Workspace\|undefined>{`
`59`		`-// Maybe already running?`
`60`		`-if(workspace.latest_build.status==="running"){`
`61`		`-returnworkspace`
`62`		`-}`
`63`		`-`
`64`	`59`	constworkspaceName=`${workspace.owner_name}/${workspace.name}`
`65`	`60`
`66`	`61`	`// A terminal will be used to stream the build, if one is necessary.`
`@@ -320,13 +315,19 @@ export class Remote {`
`320`	`315`	`disposables.push(this.registerLabelFormatter(remoteAuthority,workspace.owner_name,workspace.name))`
`321`	`316`
`322`	`317`	`// If the workspace is not in a running state, try to get it running.`
`323`		`-constupdatedWorkspace=awaitthis.maybeWaitForRunning(workspaceRestClient,workspace,parts.label,binaryPath)`
`324`		`-if(!updatedWorkspace){`
`325`		`-// User declined to start the workspace.`
`326`		`-awaitthis.closeRemote()`
	`318`	`+if(workspace.latest_build.status!=="running"){`
	`319`	`+if(!(awaitthis.maybeWaitForRunning(workspaceRestClient,workspace,parts.label,binaryPath))){`
	`320`	`+// User declined to start the workspace.`
	`321`	`+awaitthis.closeRemote()`
	`322`	`+}else{`
	`323`	`+// Start over with a fresh REST client because we may have waited an`
	`324`	`+// indeterminate amount amount of time for confirmation to start the`
	`325`	`+// workspace.`
	`326`	`+awaitthis.setup(remoteAuthority)`
	`327`	`+}`
`327`	`328`	`return`
`328`	`329`	`}`
`329`		`-this.commands.workspace=workspace=updatedWorkspace`
	`330`	`+this.commands.workspace=workspace`
`330`	`331`
`331`	`332`	`// Pick an agent.`
`332`	`333`	this.storage.writeToCoderOutputChannel(`Finding agent for${workspaceName}...`)

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitac86aa9

File tree

1 file changed

1 file changed

`‎src/remote.ts‎`

0 commit comments