From 3216d1bb3aa3af4b703988bf4da06a37a670b6e9 Mon Sep 17 00:00:00 2001
From: JP Ungaretti <jpungaretti@microsoft.com>
Date: Thu, 21 Apr 2022 14:29:30 -0700
Subject: [PATCH] Remove function return

---
 pkg/cmd/codespace/common.go  | 10 +++++-----
 pkg/cmd/codespace/jupyter.go |  4 ++--
 pkg/cmd/codespace/logs.go    |  4 ++--
 pkg/cmd/codespace/ports.go   |  4 ++--
 pkg/cmd/codespace/ssh.go     |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/cmd/codespace/common.go b/pkg/cmd/codespace/common.go
index 74043e946..04a7b62ec 100644
--- a/pkg/cmd/codespace/common.go
+++ b/pkg/cmd/codespace/common.go
@@ -62,7 +62,7 @@ func (a *App) StopProgressIndicator() {
 }
 
 // Connects to a codespace using Live Share and returns that session along with a function to end it
-func startLiveShareSession(ctx context.Context, codespace *api.Codespace, a *App, debug bool, debugFile string) (*liveshare.Session, func(*error), error) {
+func startLiveShareSession(ctx context.Context, codespace *api.Codespace, a *App, debug bool, debugFile string) (*liveshare.Session, error) {
 	// While connecting, ensure in the background that the user has keys installed.
 	// That lets us report a more useful error message if they don't.
 	authkeys := make(chan error, 1)
@@ -74,7 +74,7 @@ func startLiveShareSession(ctx context.Context, codespace *api.Codespace, a *App
 	if debug {
 		debugLogger, err := newFileLogger(debugFile)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		defer safeClose(debugLogger, &err)
 
@@ -85,11 +85,11 @@ func startLiveShareSession(ctx context.Context, codespace *api.Codespace, a *App
 	session, err := codespaces.ConnectToLiveshare(ctx, a, liveshareLogger, a.apiClient, codespace)
 	if err != nil {
 		if authErr := <-authkeys; authErr != nil {
-			return nil, nil, authErr
+			return nil, authErr
 		}
-		return nil, nil, err
+		return nil, err
 	}
-	return session, func(e *error) { safeClose(session, e) }, nil
+	return session, nil
 }
 
 //go:generate moq -fmt goimports -rm -skip-ensure -out mock_api.go . apiClient
diff --git a/pkg/cmd/codespace/jupyter.go b/pkg/cmd/codespace/jupyter.go
index c86c19568..defb8330a 100644
--- a/pkg/cmd/codespace/jupyter.go
+++ b/pkg/cmd/codespace/jupyter.go
@@ -37,11 +37,11 @@ func (a *App) Jupyter(ctx context.Context, codespaceName string) error {
 		return err
 	}
 
-	session, endSession, err := startLiveShareSession(ctx, codespace, a, false, "")
+	session, err := startLiveShareSession(ctx, codespace, a, false, "")
 	if err != nil {
 		return err
 	}
-	defer endSession(&err)
+	defer session.Close()
 
 	a.StartProgressIndicatorWithLabel("Starting JupyterLab on codespace")
 	serverPort, serverUrl, err := session.StartJupyterServer(ctx)
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
index 4a4152717..5bd4b2c5c 100644
--- a/pkg/cmd/codespace/logs.go
+++ b/pkg/cmd/codespace/logs.go
@@ -41,11 +41,11 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err
 		return err
 	}
 
-	session, endSession, err := startLiveShareSession(ctx, codespace, a, false, "")
+	session, err := startLiveShareSession(ctx, codespace, a, false, "")
 	if err != nil {
 		return err
 	}
-	defer endSession(&err)
+	defer session.Close()
 
 	// Ensure local port is listening before client (getPostCreateOutput) connects.
 	listen, err := net.Listen("tcp", "127.0.0.1:0") // arbitrary port
diff --git a/pkg/cmd/codespace/ports.go b/pkg/cmd/codespace/ports.go
index e70b66921..cbe4e8389 100644
--- a/pkg/cmd/codespace/ports.go
+++ b/pkg/cmd/codespace/ports.go
@@ -55,11 +55,11 @@ func (a *App) ListPorts(ctx context.Context, codespaceName string, exporter cmdu
 
 	devContainerCh := getDevContainer(ctx, a.apiClient, codespace)
 
-	session, endSession, err := startLiveShareSession(ctx, codespace, a, false, "")
+	session, err := startLiveShareSession(ctx, codespace, a, false, "")
 	if err != nil {
 		return err
 	}
-	defer endSession(&err)
+	defer session.Close()
 
 	a.StartProgressIndicatorWithLabel("Fetching ports")
 	ports, err := session.GetSharedServers(ctx)
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
index 4aad28974..2549a8b06 100644
--- a/pkg/cmd/codespace/ssh.go
+++ b/pkg/cmd/codespace/ssh.go
@@ -121,11 +121,11 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 		return err
 	}
 
-	session, endSession, err := startLiveShareSession(ctx, codespace, a, opts.debug, opts.debugFile)
+	session, err := startLiveShareSession(ctx, codespace, a, opts.debug, opts.debugFile)
 	if err != nil {
 		return err
 	}
-	defer endSession(&err)
+	defer session.Close()
 
 	a.StartProgressIndicatorWithLabel("Fetching SSH Details")
 	remoteSSHServerPort, sshUser, err := session.StartSSHServer(ctx)