refactor: Reduce lines of code

Emyrk · Emyrk · commit d88b1e72458d · 2021-01-22T14:50:16.000Z
Return general error and env status
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -229,25 +229,10 @@ func checkAndRebuildEnvironment(ctx context.Context, client *coder.Client, env *
 			return err
 		}
 
-		// Get a nice error based on the status
-		switch env.LatestStat.ContainerStatus {
-		case coder.EnvironmentOn:
-			// This is the case we expect, just making it explicit
-		case coder.EnvironmentOff:
-			err = fmt.Errorf("environment %q is off and will not come online", env.Name)
-		case coder.EnvironmentFailed:
-			err = fmt.Errorf("environment %q has failed to build and will not come online", env.Name)
-		case coder.EnvironmentCreating:
-			// This should never happen
-			err = fmt.Errorf("environment %q did not finish being created", env.Name)
-		default:
-			err = fmt.Errorf("environment %q has run into an unknown issue", env.Name)
-		}
-
-		if err != nil {
+		if env.LatestStat.ContainerStatus != coder.EnvironmentOn {
 			// This means we had a timeout
 			return clog.Fatal("the environment rebuild ran into an issue",
-				err.Error(),
+				fmt.Sprintf("environment %q rebuild has failed and will not come online", env.Name),
 				fmt.Sprintf("its current status is %q", env.LatestStat.ContainerStatus),
 				clog.BlankLine,
 				// TODO: (@emyrk) can they check these logs from the cli? Isn't this the logs that
