Comments from pr.

edgonmsft · web-flow · commit 903b7be7dea2 · 2021-08-30T21:01:13.000Z
diff --git a/cmd/ghcs/logs.go b/cmd/ghcs/logs.go
@@ -57,7 +57,7 @@ func logs(tail bool, codespaceName string) error {
 		return fmt.Errorf("connecting to liveshare: %v", err)
 	}
 
-	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient)
+	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient, log)
 	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,7 @@ func ssh(sshProfile, codespaceName string, sshServerPort int) error {
 		return fmt.Errorf("error connecting to liveshare: %v", err)
 	}
 
-	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient)
+	remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient, log)
 	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
@@ -47,7 +47,9 @@ func MakeSSHTunnel(ctx context.Context, lsclient *liveshare.Client, localSSHPort
 
 // 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, client *liveshare.Client) (serverPort int, user string, err error) {
+func StartSSHServer(ctx context.Context, client *liveshare.Client, log logger) (serverPort int, user string, err error) {
+	log.Println("Fetching SSH details...")
+
 	sshServer, err := liveshare.NewSSHServer(client)
 	if err != nil {
 		return 0, "", fmt.Errorf("error creating live share: %v", err)
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
@@ -45,7 +45,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 		return fmt.Errorf("connect to liveshare: %v", err)
 	}
 
-	remoteSSHServerPort, _, err := StartSSHServer(ctx, lsclient)
+	remoteSSHServerPort, sshUser, err := StartSSHServer(ctx, lsclient, log)
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %v", err)
 	}
@@ -65,7 +65,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 		case err := <-connClosed:
 			return fmt.Errorf("connection closed: %v", err)
 		case <-t.C:
-			states, err := getPostCreateOutput(ctx, tunnelPort, codespace)
+			states, err := getPostCreateOutput(ctx, tunnelPort, codespace, sshUser)
 			if err != nil {
 				return fmt.Errorf("get post create output: %v", err)
 			}
@@ -75,9 +75,9 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 	}
 }
 
-func getPostCreateOutput(ctx context.Context, tunnelPort int, codespace *api.Codespace) ([]PostCreateState, error) {
+func getPostCreateOutput(ctx context.Context, tunnelPort int, codespace *api.Codespace, user string) ([]PostCreateState, error) {
 	stdout, err := RunCommand(
-		ctx, tunnelPort, sshDestination(codespace),
+		ctx, tunnelPort, sshDestination(codespace, user),
 		"cat /workspaces/.codespaces/shared/postCreateOutput.json",
 	)
 	if err != nil {
@@ -101,10 +101,6 @@ func getPostCreateOutput(ctx context.Context, tunnelPort int, codespace *api.Cod
 }
 
 // TODO(josebalius): this won't be needed soon
-func sshDestination(codespace *api.Codespace) string {
-	user := "codespace"
-	if codespace.RepositoryNWO == "github/github" {
-		user = "root"
-	}
+func sshDestination(codespace *api.Codespace, user string) string {
 	return user + "@localhost"
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func logs(tail bool, codespaceName string) error {`
`57`	`57`	`return fmt.Errorf("connecting to liveshare: %v", err)`
`58`	`58`	`}`
`59`	`59`
`60`		`- remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient)`
	`60`	`+ remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient, log)`
`61`	`61`	`if err != nil {`
`62`	`62`	`return fmt.Errorf("error getting ssh server details: %v", err)`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func ssh(sshProfile, codespaceName string, sshServerPort int) error {`
`59`	`59`	`return fmt.Errorf("error connecting to liveshare: %v", err)`
`60`	`60`	`}`
`61`	`61`
`62`		`- remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient)`
	`62`	`+ remoteSSHServerPort, sshUser, err := codespaces.StartSSHServer(ctx, lsclient, log)`
`63`	`63`	`if err != nil {`
`64`	`64`	`return fmt.Errorf("error getting ssh server details: %v", err)`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u`
`45`	`45`	`return fmt.Errorf("connect to liveshare: %v", err)`
`46`	`46`	`}`
`47`	`47`
`48`		`- remoteSSHServerPort, _, err := StartSSHServer(ctx, lsclient)`
	`48`	`+ remoteSSHServerPort, sshUser, err := StartSSHServer(ctx, lsclient, log)`
`49`	`49`	`if err != nil {`
`50`	`50`	`return fmt.Errorf("error getting ssh server details: %v", err)`
`51`	`51`	`}`
`@@ -65,7 +65,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u`
`65`	`65`	`case err := <-connClosed:`
`66`	`66`	`return fmt.Errorf("connection closed: %v", err)`
`67`	`67`	`case <-t.C:`
`68`		`- states, err := getPostCreateOutput(ctx, tunnelPort, codespace)`
	`68`	`+ states, err := getPostCreateOutput(ctx, tunnelPort, codespace, sshUser)`
`69`	`69`	`if err != nil {`
`70`	`70`	`return fmt.Errorf("get post create output: %v", err)`
`71`	`71`	`}`
`@@ -75,9 +75,9 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-func getPostCreateOutput(ctx context.Context, tunnelPort int, codespace *api.Codespace) ([]PostCreateState, error) {`
	`78`	`+func getPostCreateOutput(ctx context.Context, tunnelPort int, codespace *api.Codespace, user string) ([]PostCreateState, error) {`
`79`	`79`	`stdout, err := RunCommand(`
`80`		`- ctx, tunnelPort, sshDestination(codespace),`
	`80`	`+ ctx, tunnelPort, sshDestination(codespace, user),`
`81`	`81`	`"cat /workspaces/.codespaces/shared/postCreateOutput.json",`
`82`	`82`	`)`
`83`	`83`	`if err != nil {`
`@@ -101,10 +101,6 @@ func getPostCreateOutput(ctx context.Context, tunnelPort int, codespace *api.Cod`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// TODO(josebalius): this won't be needed soon`
`104`		`-func sshDestination(codespace *api.Codespace) string {`
`105`		`- user := "codespace"`
`106`		`- if codespace.RepositoryNWO == "github/github" {`
`107`		`- user = "root"`
`108`		`- }`
	`104`	`+func sshDestination(codespace *api.Codespace, user string) string {`
`109`	`105`	`return user + "@localhost"`
`110`	`106`	`}`