STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7284 from cli/cmbrose/invoker-close-fix

Browse source 
Fix codespaces invoker immediately closing
This commit is contained in:
Nate Smith 2023-04-06 17:34:41 -07:00 • committed by GitHub
commit 4f08b28250
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/cmd/codespace/jupyter.go
View file

@ -45,17 +45,23 @@ func (a *App) Jupyter(ctx context.Context, selector *CodespaceSelector) (err err
}
defer safeClose(session, &err)
serverPort, serverUrl := 0, ""
var (
invoker rpc.Invoker
serverPort int
serverUrl string
)
err = a.RunWithProgress("Starting JupyterLab on codespace", func() (err error) {
invoker, err := rpc.CreateInvoker(ctx, session)
invoker, err = rpc.CreateInvoker(ctx, session)
if err != nil {
return
}
defer safeClose(invoker, &err)
serverPort, serverUrl, err = invoker.StartJupyterServer(ctx)
return
})
if invoker != nil {
defer safeClose(invoker, &err)
}
if err != nil {
return err
}

12
pkg/cmd/codespace/ssh.go
View file

@ -171,17 +171,23 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
}
defer safeClose(session, &err)
remoteSSHServerPort, sshUser := 0, ""
var (
invoker rpc.Invoker
remoteSSHServerPort int
sshUser string
)
err = a.RunWithProgress("Fetching SSH Details", func() (err error) {
invoker, err := rpc.CreateInvoker(ctx, session)
invoker, err = rpc.CreateInvoker(ctx, session)
if err != nil {
return
}
defer safeClose(invoker, &err)
remoteSSHServerPort, sshUser, err = invoker.StartSSHServerWithOptions(ctx, startSSHOptions)
return
})
if invoker != nil {
defer safeClose(invoker, &err)
}
if err != nil {
return fmt.Errorf("error getting ssh server details: %w", err)
}