fix(compute/serve): ensure spinner is closed for all logic branches (#…

…849)
fastly · Mar 1, 2023 · 12c0150 · 12c0150
1 parent 0f1dfb3
commit 12c0150
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/commands/compute/serve.go b/pkg/commands/compute/serve.go
@@ -454,6 +454,12 @@ func updateViceroy(
 		}
 	}
 
+	spinner.StopMessage(msg)
+	err = spinner.Stop()
+	if err != nil {
+		return err
+	}
+
 	if latest.GT(current) {
 		text.Break(out)
 		text.Break(out)
@@ -496,6 +502,12 @@ func updateViceroy(
 				return fmt.Errorf("error moving latest Viceroy binary in place: %w", err)
 			}
 		}
+
+		spinner.StopMessage(msg)
+		err = spinner.Stop()
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

diff --git a/pkg/text/spinner.go b/pkg/text/spinner.go
@@ -9,6 +9,7 @@ import (
 
 // Spinner represents a terminal prompt status indicator.
 type Spinner interface {
+	Status() yacspin.SpinnerStatus
 	Start() error
 	Message(message string)
 	StopFailMessage(message string)