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

liveshare client upgrade

Browse source
This commit is contained in:
Jose Garcia 2021-07-28 08:33:06 -04:00
parent 77d0bc1901
commit cba40ad72a
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/ghcs/ports.go
View file

@ -107,8 +107,8 @@ func Ports() error {
}
func getPorts(ctx context.Context, liveShareClient *liveshare.Client) (liveshare.Ports, error) {
server, err := liveShareClient.NewServer()
func getPorts(ctx context.Context, lsclient *liveshare.Client) (liveshare.Ports, error) {
server, err := liveshare.NewServer(lsclient)
if err != nil {
return nil, fmt.Errorf("error creating server: %v", err)
}
@ -214,12 +214,12 @@ func updatePortVisibility(codespaceName, sourcePort string, public bool) error {
return fmt.Errorf("error getting codespace: %v", err)
}
liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
if err != nil {
return fmt.Errorf("error connecting to liveshare: %v", err)
}
server, err := liveShareClient.NewServer()
server, err := liveshare.NewServer(lsclient)
if err != nil {
return fmt.Errorf("error creating server: %v", err)
}
@ -276,12 +276,12 @@ func forwardPort(codespaceName, sourcePort, destPort string) error {
return fmt.Errorf("error getting codespace: %v", err)
}
liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
if err != nil {
return fmt.Errorf("error connecting to liveshare: %v", err)
}
server, err := liveShareClient.NewServer()
server, err := liveshare.NewServer(lsclient)
if err != nil {
return fmt.Errorf("error creating server: %v", err)
}
@ -301,7 +301,7 @@ func forwardPort(codespaceName, sourcePort, destPort string) error {
}
fmt.Println("Forwarding port: " + sourcePort + " -> " + destPort)
portForwarder := liveshare.NewLocalPortForwarder(liveShareClient, server, dstPortInt)
portForwarder := liveshare.NewPortForwarder(lsclient, server, dstPortInt)
if err := portForwarder.Start(ctx); err != nil {
return fmt.Errorf("error forwarding port: %v", err)
}

8
cmd/ghcs/ssh.go
View file

@ -82,12 +82,12 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
}
}
liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
if err != nil {
return fmt.Errorf("error connecting to liveshare: %v", err)
}
terminal, err := liveShareClient.NewTerminal()
terminal, err := liveshare.NewTerminal(lsclient)
if err != nil {
return fmt.Errorf("error creating liveshare terminal: %v", err)
}
@ -106,7 +106,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
fmt.Printf("\n")
}
server, err := liveShareClient.NewServer()
server, err := liveshare.NewServer(lsclient)
if err != nil {
return fmt.Errorf("error creating server: %v", err)
}
@ -121,7 +121,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
return fmt.Errorf("error sharing sshd port: %v", err)
}
portForwarder := liveshare.NewLocalPortForwarder(liveShareClient, server, port)
portForwarder := liveshare.NewPortForwarder(lsclient, server, port)
go func() {
if err := portForwarder.Start(ctx); err != nil {
panic(fmt.Errorf("error forwarding port: %v", err))