Print delete failures as they occur

mislav · mislav · commit e8212a80a9dc · 2021-09-23T17:14:25.000+02:00
diff --git a/cmd/ghcs/delete.go b/cmd/ghcs/delete.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/github/ghcs/cmd/ghcs/output"
 	"github.com/github/ghcs/internal/api"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
@@ -55,7 +56,8 @@ func newDeleteCmd() *cobra.Command {
 			if opts.deleteAll && opts.repoFilter != "" {
 				return errors.New("both --all and --repo is not supported")
 			}
-			return delete(context.Background(), opts)
+			log := output.NewLogger(cmd.OutOrStdout(), cmd.ErrOrStderr(), !opts.isInteractive)
+			return delete(context.Background(), log, opts)
 		},
 	}
 
@@ -68,7 +70,11 @@ func newDeleteCmd() *cobra.Command {
 	return deleteCmd
 }
 
-func delete(ctx context.Context, opts deleteOptions) error {
+type logger interface {
+	Errorf(format string, v ...interface{}) (int, error)
+}
+
+func delete(ctx context.Context, log logger, opts deleteOptions) error {
 	user, err := opts.apiClient.GetUser(ctx)
 	if err != nil {
 		return fmt.Errorf("error getting user: %w", err)
@@ -127,13 +133,17 @@ func delete(ctx context.Context, opts deleteOptions) error {
 		codespaceName := c.Name
 		g.Go(func() error {
 			if err := opts.apiClient.DeleteCodespace(ctx, user.Login, codespaceName); err != nil {
-				return fmt.Errorf("error deleting codespace: %w", err)
+				log.Errorf("error deleting codespace %q: %v", codespaceName, err)
+				return err
 			}
 			return nil
 		})
 	}
 
-	return g.Wait()
+	if err := g.Wait(); err != nil {
+		return errors.New("some codespaces failed to delete")
+	}
+	return nil
 }
 
 func confirmDeletion(p prompter, codespace *api.Codespace, isInteractive bool) (bool, error) {
diff --git a/cmd/ghcs/delete_test.go b/cmd/ghcs/delete_test.go
@@ -156,7 +156,7 @@ func TestDelete(t *testing.T) {
 				},
 			}
 
-			err := delete(context.Background(), opts)
+			err := delete(context.Background(), nil, opts)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("delete() error = %v, wantErr %v", err, tt.wantErr)
 			}

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func TestDelete(t *testing.T) {`
`156`	`156`	`},`
`157`	`157`	`}`
`158`	`158`
`159`		`- err := delete(context.Background(), opts)`
	`159`	`+ err := delete(context.Background(), nil, opts)`
`160`	`160`	`if (err != nil) != tt.wantErr {`
`161`	`161`	`t.Errorf("delete() error = %v, wantErr %v", err, tt.wantErr)`
`162`	`162`	`}`