Cleaner indicator cancellation

axiomhq · Mar 29, 2021 · 9b88239 · 9b88239
1 parent 4eebec3
commit 9b88239
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/cmd/axiom/organization/organization_info.go b/cmd/axiom/organization/organization_info.go
@@ -83,11 +83,13 @@ func runInfo(ctx context.Context, opts *infoOptions) error {
 	}
 
 	progStop := opts.IO.StartActivityIndicator()
+	defer progStop()
+
 	organization, err := client.Organizations.Get(ctx, opts.ID)
 	if err != nil {
-		progStop()
 		return err
 	}
+
 	progStop()
 
 	pagerStop, err := opts.IO.StartPager(ctx)

diff --git a/cmd/axiom/organization/organization_license.go b/cmd/axiom/organization/organization_license.go
@@ -85,11 +85,13 @@ func runLicense(ctx context.Context, opts *licenseOptions) error {
 	}
 
 	progStop := opts.IO.StartActivityIndicator()
+	defer progStop()
+
 	organization, err := client.Organizations.Get(ctx, opts.ID)
 	if err != nil {
-		progStop()
 		return err
 	}
+
 	progStop()
 
 	pagerStop, err := opts.IO.StartPager(ctx)

diff --git a/cmd/axiom/organization/organization_list.go b/cmd/axiom/organization/organization_list.go
@@ -57,11 +57,13 @@ func runList(ctx context.Context, opts *listOptions) error {
 	}
 
 	progStop := opts.IO.StartActivityIndicator()
+	defer progStop()
+
 	organizations, err := client.Organizations.List(ctx)
 	if err != nil {
-		progStop()
 		return err
 	}
+
 	progStop()
 
 	pagerStop, err := opts.IO.StartPager(ctx)