Merge pull request cli#158 from github/jg/go-liveshare-0.16.0

josebalius · web-flow · commit 45a9715e9f9b · 2021-09-15T15:40:58.000-04:00
upgrade to go-liveshare 0.16.0
diff --git a/cmd/ghcs/logs.go b/cmd/ghcs/logs.go
@@ -70,7 +70,8 @@ func logs(ctx context.Context, log *output.Logger, codespaceName string, follow
 	defer listen.Close()
 	localPort := listen.Addr().(*net.TCPAddr).Port
 
-	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, session, log)
+	log.Println("Fetching SSH Details...")
+	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %v", err)
 	}
diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
@@ -59,7 +59,8 @@ func ssh(ctx context.Context, sshProfile, codespaceName string, localSSHServerPo
 		return fmt.Errorf("error connecting to Live Share: %v", err)
 	}
 
-	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, session, log)
+	log.Println("Fetching SSH Details...")
+	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %v", err)
 	}
diff --git a/internal/codespaces/ssh.go b/internal/codespaces/ssh.go
@@ -2,40 +2,12 @@ package codespaces
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"os"
 	"os/exec"
 	"strconv"
 	"strings"
-
-	"github.com/github/go-liveshare"
 )
 
-// StartSSHServer installs (if necessary) and starts the SSH in the codespace.
-// It returns the remote port where it is running, the user to log in with, or an error if something failed.
-func StartSSHServer(ctx context.Context, session *liveshare.Session, log logger) (serverPort int, user string, err error) {
-	log.Println("Fetching SSH details...")
-
-	sshServer := session.SSHServer()
-
-	sshServerStartResult, err := sshServer.StartRemoteServer(ctx)
-	if err != nil {
-		return 0, "", fmt.Errorf("error starting live share: %v", err)
-	}
-
-	if !sshServerStartResult.Result {
-		return 0, "", errors.New(sshServerStartResult.Message)
-	}
-
-	portInt, err := strconv.Atoi(sshServerStartResult.ServerPort)
-	if err != nil {
-		return 0, "", fmt.Errorf("error parsing port: %v", err)
-	}
-
-	return portInt, sshServerStartResult.User, nil
-}
-
 // Shell runs an interactive secure shell over an existing
 // port-forwarding session. It runs until the shell is terminated
 // (including by cancellation of the context).
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
@@ -54,7 +54,8 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 	}
 	localPort := listen.Addr().(*net.TCPAddr).Port
 
-	remoteSSHServerPort, sshUser, err := StartSSHServer(ctx, session, log)
+	log.Println("Fetching SSH Details...")
+	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ func logs(ctx context.Context, log *output.Logger, codespaceName string, follow`
`70`	`70`	`defer listen.Close()`
`71`	`71`	`localPort := listen.Addr().(*net.TCPAddr).Port`
`72`	`72`
`73`		`- remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, session, log)`
	`73`	`+ log.Println("Fetching SSH Details...")`
	`74`	`+ remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)`
`74`	`75`	`if err != nil {`
`75`	`76`	`return fmt.Errorf("error getting ssh server details: %v", err)`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ func ssh(ctx context.Context, sshProfile, codespaceName string, localSSHServerPo`
`59`	`59`	`return fmt.Errorf("error connecting to Live Share: %v", err)`
`60`	`60`	`}`
`61`	`61`
`62`		`- remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, session, log)`
	`62`	`+ log.Println("Fetching SSH Details...")`
	`63`	`+ remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)`
`63`	`64`	`if err != nil {`
`64`	`65`	`return fmt.Errorf("error getting ssh server details: %v", err)`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u`
`54`	`54`	`}`
`55`	`55`	`localPort := listen.Addr().(*net.TCPAddr).Port`
`56`	`56`
`57`		`- remoteSSHServerPort, sshUser, err := StartSSHServer(ctx, session, log)`
	`57`	`+ log.Println("Fetching SSH Details...")`
	`58`	`+ remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)`
`58`	`59`	`if err != nil {`
`59`	`60`	`return fmt.Errorf("error getting ssh server details: %v", err)`
`60`	`61`	`}`