From 39a1dc90af77adc0419d930ca6eaf78a2bded5e3 Mon Sep 17 00:00:00 2001
From: JP Ungaretti <git@jungaretti.com>
Date: Tue, 7 Mar 2023 19:05:49 +0000
Subject: [PATCH] Match return style

---
 pkg/cmd/codespace/jupyter.go | 12 ++++++++----
 pkg/cmd/codespace/logs.go    | 12 ++++++++----
 pkg/cmd/codespace/ssh.go     | 14 +++++++++-----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/pkg/cmd/codespace/jupyter.go b/pkg/cmd/codespace/jupyter.go
index 92200ef42..7b4c6963b 100644
--- a/pkg/cmd/codespace/jupyter.go
+++ b/pkg/cmd/codespace/jupyter.go
@@ -46,15 +46,19 @@ func (a *App) Jupyter(ctx context.Context, selector *CodespaceSelector) (err err
 	defer safeClose(session, &err)
 
 	serverPort, serverUrl := 0, ""
-	err = a.RunWithProgress("Starting JupyterLab on codespace", func() error {
+	err = a.RunWithProgress("Starting JupyterLab on codespace", func() (err error) {
 		invoker, err := rpc.CreateInvoker(ctx, session)
 		if err != nil {
-			return err
+			return
+		}
+
+		err = invoker.Close()
+		if err != nil {
+			return
 		}
-		defer safeClose(invoker, &err)
 
 		serverPort, serverUrl, err = invoker.StartJupyterServer(ctx)
-		return err
+		return
 	})
 	if err != nil {
 		return err
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
index 1acda6aaf..0457af999 100644
--- a/pkg/cmd/codespace/logs.go
+++ b/pkg/cmd/codespace/logs.go
@@ -56,15 +56,19 @@ func (a *App) Logs(ctx context.Context, selector *CodespaceSelector, follow bool
 	defer listen.Close()
 
 	remoteSSHServerPort, sshUser := 0, ""
-	err = a.RunWithProgress("Fetching SSH Details", func() error {
+	err = a.RunWithProgress("Fetching SSH Details", func() (err error) {
 		invoker, err := rpc.CreateInvoker(ctx, session)
 		if err != nil {
-			return err
+			return
+		}
+
+		err = invoker.Close()
+		if err != nil {
+			return
 		}
-		defer safeClose(invoker, &err)
 
 		remoteSSHServerPort, sshUser, err = invoker.StartSSHServer(ctx)
-		return err
+		return
 	})
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %w", err)
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
index 3d89ad6b0..d51626e20 100644
--- a/pkg/cmd/codespace/ssh.go
+++ b/pkg/cmd/codespace/ssh.go
@@ -172,15 +172,19 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 	defer safeClose(session, &err)
 
 	remoteSSHServerPort, sshUser := 0, ""
-	err = a.RunWithProgress("Fetching SSH Details", func() error {
+	err = a.RunWithProgress("Fetching SSH Details", func() (err error) {
 		invoker, err := rpc.CreateInvoker(ctx, session)
 		if err != nil {
-			return err
+			return
+		}
+
+		err = invoker.Close()
+		if err != nil {
+			return
 		}
-		defer safeClose(invoker, &err)
 
 		remoteSSHServerPort, sshUser, err = invoker.StartSSHServerWithOptions(ctx, startSSHOptions)
-		return err
+		return
 	})
 	if err != nil {
 		return fmt.Errorf("error getting ssh server details: %w", err)
@@ -476,7 +480,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts sshOptions) (err erro
 	if opts.selector.codespaceName == "" {
 		err = a.RunWithProgress("Fetching codespaces", func() (err error) {
 			csList, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{})
-			return err
+			return
 		})
 	} else {
 		var codespace *api.Codespace