From a848cd1bd028d1b1c95e0e6ab9f11910076dee8a Mon Sep 17 00:00:00 2001
From: JP Ungaretti <git@jungaretti.com>
Date: Thu, 9 Feb 2023 23:13:44 +0000
Subject: [PATCH] Adopt in stop.go

---
 pkg/cmd/codespace/stop.go | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkg/cmd/codespace/stop.go b/pkg/cmd/codespace/stop.go
index bc60e9dc1..0668fd04f 100644
--- a/pkg/cmd/codespace/stop.go
+++ b/pkg/cmd/codespace/stop.go
@@ -42,9 +42,11 @@ func (a *App) StopCodespace(ctx context.Context, opts *stopOptions) error {
 	ownerName := opts.userName
 
 	if codespaceName == "" {
-		a.StartProgressIndicatorWithLabel("Fetching codespaces")
-		codespaces, err := a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: ownerName})
-		a.StopProgressIndicator()
+		var codespaces []*api.Codespace
+		err := a.RunWithProgress("Fetching codespaces", func() (err error) {
+			codespaces, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: ownerName})
+			return
+		})
 		if err != nil {
 			return fmt.Errorf("failed to list codespaces: %w", err)
 		}
@@ -68,29 +70,30 @@ func (a *App) StopCodespace(ctx context.Context, opts *stopOptions) error {
 		codespaceName = codespace.Name
 		ownerName = codespace.Owner.Login
 	} else {
-		a.StartProgressIndicatorWithLabel("Fetching codespace")
-
 		var c *api.Codespace
-		var err error
-
-		if opts.orgName == "" {
-			c, err = a.apiClient.GetCodespace(ctx, codespaceName, false)
-		} else {
-			c, err = a.apiClient.GetOrgMemberCodespace(ctx, opts.orgName, ownerName, codespaceName)
-		}
-		a.StopProgressIndicator()
+		err := a.RunWithProgress("Fetching codespace", func() (err error) {
+			if opts.orgName == "" {
+				c, err = a.apiClient.GetCodespace(ctx, codespaceName, false)
+			} else {
+				c, err = a.apiClient.GetOrgMemberCodespace(ctx, opts.orgName, ownerName, codespaceName)
+			}
+			return
+		})
 		if err != nil {
 			return fmt.Errorf("failed to get codespace: %q: %w", codespaceName, err)
 		}
+
 		cs := codespace{c}
 		if !cs.running() {
 			return fmt.Errorf("codespace %q is not running", codespaceName)
 		}
 	}
 
-	a.StartProgressIndicatorWithLabel("Stopping codespace")
-	defer a.StopProgressIndicator()
-	if err := a.apiClient.StopCodespace(ctx, codespaceName, opts.orgName, ownerName); err != nil {
+	err := a.RunWithProgress("Stoppping codespace", func() (err error) {
+		err = a.apiClient.StopCodespace(ctx, codespaceName, opts.orgName, ownerName)
+		return
+	})
+	if err != nil {
 		return fmt.Errorf("failed to stop codespace: %w", err)
 	}