cli · dmgardiner25 · Oct 12, 2023 · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023
@@ -1,5 +1,4 @@
 * @cli/code-reviewers
 
 pkg/cmd/codespace/ @cli/codespaces
-pkg/liveshare/ @cli/codespaces
 internal/codespaces/ @cli/codespaces
@@ -27,12 +27,11 @@ require (
 	github.com/mattn/go-colorable v0.1.13
 	github.com/mattn/go-isatty v0.0.19
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
-	github.com/microsoft/dev-tunnels v0.0.21
+	github.com/microsoft/dev-tunnels v0.0.25
 	github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/rivo/tview v0.0.0-20221029100920-c4a7e501810d
 	github.com/shurcooL/githubv4 v0.0.0-20230704064427-599ae7bbf278
-	github.com/sourcegraph/jsonrpc2 v0.1.0
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4

@@ -67,7 +67,6 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
@@ -118,8 +117,8 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyex
 github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
 github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
 github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
-github.com/microsoft/dev-tunnels v0.0.21 h1:p4QP7C5ZOyP9bGbmanRjPxUMckfi9Z41Gl+KY4C11w0=
-github.com/microsoft/dev-tunnels v0.0.21/go.mod h1:frU++12T/oqxckXkDpTuYa427ncguEOodSPZcGCCrzQ=
+github.com/microsoft/dev-tunnels v0.0.25 h1:UlMKUI+2O8cSu4RlB52ioSyn1LthYSVkJA+CSTsdKoA=
+github.com/microsoft/dev-tunnels v0.0.25/go.mod h1:frU++12T/oqxckXkDpTuYa427ncguEOodSPZcGCCrzQ=
 github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
@@ -150,8 +149,6 @@ github.com/shurcooL/githubv4 v0.0.0-20230704064427-599ae7bbf278 h1:kdEGVAV4sO46D
 github.com/shurcooL/githubv4 v0.0.0-20230704064427-599ae7bbf278/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8=
 github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 h1:17JxqqJY66GmZVHkmAsGEkcIu0oCe3AM420QDgGwZx0=
 github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466/go.mod h1:9dIRpgIY7hVhoqfe0/FcYp0bpInZaT7dc3BYOprrIUE=
-github.com/sourcegraph/jsonrpc2 v0.1.0 h1:ohJHjZ+PcaLxDUjqk2NC3tIGsVa5bXThe1ZheSXOjuk=
-github.com/sourcegraph/jsonrpc2 v0.1.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
 github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=

@@ -247,11 +247,6 @@ const (
 )
 
 type CodespaceConnection struct {
-	SessionID        string           `json:"sessionId"`
-	SessionToken     string           `json:"sessionToken"`
-	RelayEndpoint    string           `json:"relayEndpoint"`
-	RelaySAS         string           `json:"relaySas"`
-	HostPublicKeys   []string         `json:"hostPublicKeys"`
 	TunnelProperties TunnelProperties `json:"tunnelProperties"`
 }
 

@@ -11,30 +11,20 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/internal/codespaces/connection"
-	"github.com/cli/cli/v2/pkg/liveshare"
 )
 
-func connectionReady(codespace *api.Codespace, usingDevTunnels bool) bool {
+func connectionReady(codespace *api.Codespace) bool {
 	// If the codespace is not available, it is not ready
 	if codespace.State != api.CodespaceStateAvailable {
 		return false
 	}
 
-	// If using Dev Tunnels, we need to check that we have all of the required tunnel properties
-	if usingDevTunnels {
-		return codespace.Connection.TunnelProperties.ConnectAccessToken != "" &&
-			codespace.Connection.TunnelProperties.ManagePortsAccessToken != "" &&
-			codespace.Connection.TunnelProperties.ServiceUri != "" &&
-			codespace.Connection.TunnelProperties.TunnelId != "" &&
-			codespace.Connection.TunnelProperties.ClusterId != "" &&
-			codespace.Connection.TunnelProperties.Domain != ""
-	}
-
-	// If not using Dev Tunnels, we need to check that we have all of the required Live Share properties
-	return codespace.Connection.SessionID != "" &&
-		codespace.Connection.SessionToken != "" &&
-		codespace.Connection.RelayEndpoint != "" &&
-		codespace.Connection.RelaySAS != ""
+	return codespace.Connection.TunnelProperties.ConnectAccessToken != "" &&
+		codespace.Connection.TunnelProperties.ManagePortsAccessToken != "" &&
+		codespace.Connection.TunnelProperties.ServiceUri != "" &&
+		codespace.Connection.TunnelProperties.TunnelId != "" &&
+		codespace.Connection.TunnelProperties.ClusterId != "" &&
+		codespace.Connection.TunnelProperties.Domain != ""
 }
 
 type apiClient interface {
@@ -48,11 +38,6 @@ type progressIndicator interface {
 	StopProgressIndicator()
 }
 
-type logger interface {
-	Println(v ...interface{})
-	Printf(f string, v ...interface{})
-}
-
 type TimeoutError struct {
 	message string
 }
@@ -64,7 +49,7 @@ func (e *TimeoutError) Error() string {
 // GetCodespaceConnection waits until a codespace is able
 // to be connected to and initializes a connection to it.
 func GetCodespaceConnection(ctx context.Context, progress progressIndicator, apiClient apiClient, codespace *api.Codespace) (*connection.CodespaceConnection, error) {
-	codespace, err := waitUntilCodespaceConnectionReady(ctx, progress, apiClient, codespace, true)
+	codespace, err := waitUntilCodespaceConnectionReady(ctx, progress, apiClient, codespace)
 	if err != nil {
 		return nil, err
 	}
@@ -80,29 +65,8 @@ func GetCodespaceConnection(ctx context.Context, progress progressIndicator, api
 	return connection.NewCodespaceConnection(ctx, codespace, httpClient)
 }
 
-// ConnectToLiveshare waits until a codespace is able to be
-// connected to and connects to it using a Live Share session.
-func ConnectToLiveshare(ctx context.Context, progress progressIndicator, sessionLogger logger, apiClient apiClient, codespace *api.Codespace) (*liveshare.Session, error) {
-	codespace, err := waitUntilCodespaceConnectionReady(ctx, progress, apiClient, codespace, false)
-	if err != nil {
-		return nil, err
-	}
-
-	progress.StartProgressIndicatorWithLabel("Connecting to codespace")
-	defer progress.StopProgressIndicator()
-
-	return liveshare.Connect(ctx, liveshare.Options{
-		SessionID:      codespace.Connection.SessionID,
-		SessionToken:   codespace.Connection.SessionToken,
-		RelaySAS:       codespace.Connection.RelaySAS,
-		RelayEndpoint:  codespace.Connection.RelayEndpoint,
-		HostPublicKeys: codespace.Connection.HostPublicKeys,
-		Logger:         sessionLogger,
-	})
-}
-
 // waitUntilCodespaceConnectionReady waits for a Codespace to be running and is able to be connected to.
-func waitUntilCodespaceConnectionReady(ctx context.Context, progress progressIndicator, apiClient apiClient, codespace *api.Codespace, usingDevTunnels bool) (*api.Codespace, error) {
+func waitUntilCodespaceConnectionReady(ctx context.Context, progress progressIndicator, apiClient apiClient, codespace *api.Codespace) (*api.Codespace, error) {
 	if codespace.State != api.CodespaceStateAvailable {
 		progress.StartProgressIndicatorWithLabel("Starting codespace")
 		defer progress.StopProgressIndicator()
@@ -111,7 +75,7 @@ func waitUntilCodespaceConnectionReady(ctx context.Context, progress progressInd
 		}
 	}
 
-	if !connectionReady(codespace, usingDevTunnels) {
+	if !connectionReady(codespace) {
 		expBackoff := backoff.NewExponentialBackOff()
 		expBackoff.Multiplier = 1.1
 		expBackoff.MaxInterval = 10 * time.Second
@@ -124,7 +88,7 @@ func waitUntilCodespaceConnectionReady(ctx context.Context, progress progressInd
 				return backoff.Permanent(fmt.Errorf("error getting codespace: %w", err))
 			}
 
-			if connectionReady(codespace, usingDevTunnels) {
+			if connectionReady(codespace) {
 				return nil
 			}