fixup! Add coder envs rm command for removing environments

cmoog · cmoog · commit e76a60e46386 · 2020-10-23T11:07:06.000-05:00
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -12,7 +12,6 @@ import (
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
-	"golang.org/x/sync/semaphore"
 	"golang.org/x/xerrors"
 )
 
@@ -198,7 +197,7 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 			clog.LogSuccess(
 				"creating environment...",
 				clog.BlankLine,
-				clog.Tipf(`run "coder envs watch-build %q" to trail the build logs`, args[0]),
+				clog.Tipf(`run "coder envs watch-build %s" to trail the build logs`, env.Name),
 			)
 
 			if follow {
@@ -335,45 +334,43 @@ func rmEnvsCommand(user *string) *cobra.Command {
 			if err != nil {
 				return err
 			}
-
-			// only show one confirmation dialogue at a time
-			confirmLimiter := semaphore.NewWeighted(1)
+			if !force {
+				confirm := promptui.Prompt{
+					Label:     fmt.Sprintf("Delete environments %q? (all data will be lost)", args),
+					IsConfirm: true,
+				}
+				if _, err := confirm.Run(); err != nil {
+					return err
+				}
+			}
 
 			var egroup errgroup.Group
+			var failures int32
 			for _, envName := range args {
 				envName := envName
 				egroup.Go(func() error {
 					env, err := findEnv(ctx, client, envName, *user)
 					if err != nil {
+						atomic.AddInt32(&failures, 1)
 						clog.Log(err)
 						return err
 					}
-					if !force {
-						confirm := promptui.Prompt{
-							Label:     fmt.Sprintf("Delete environment \"%s\"? (all data will be lost)", env.Name),
-							IsConfirm: true,
-						}
-						if err := confirmLimiter.Acquire(ctx, 1); err != nil {
-							return err
-						}
-
-						if _, err = confirm.Run(); err != nil {
-							confirmLimiter.Release(1)
-							return xerrors.Errorf("confirm deletion of environment \"%s\"", env.Name)
-						}
-						confirmLimiter.Release(1)
-					}
 					if err = client.DeleteEnvironment(cmd.Context(), env.ID); err != nil {
-						err = clog.Error(fmt.Sprintf(`failed to delete environment "%s"`, env.Name), clog.Cause(err.Error()))
+						atomic.AddInt32(&failures, 1)
+						err = clog.Error(
+							fmt.Sprintf(`failed to delete environment "%s"`, env.Name),
+							clog.Causef(err.Error()),
+						)
 						clog.Log(err)
 						return err
 					}
+					clog.LogSuccess(fmt.Sprintf("deleted environment %q", env.Name))
 					return nil
 				})
 			}
 
 			if err = egroup.Wait(); err != nil {
-				return xerrors.Errorf("some environment remove operations failed")
+				return xerrors.Errorf("%d failures emitted", failures)
 			}
 			return nil
 		},
