Fixes

goodspark · goodspark · commit 56b570ac3145 · 2021-08-12T16:19:56.000Z
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -32,6 +32,11 @@ func lookupUserOrgs(user *coder.User, orgs []coder.Organization) []coder.Organiz
 	return userOrgs
 }
 
+// getAllWorkspaces gets all workspaces for all users, on all providers.
+func getAllWorkspaces(ctx context.Context, client coder.Client) ([]coder.Workspace, error) {
+	return client.Workspaces(ctx)
+}
+
 // getWorkspaces returns all workspaces for the user.
 func getWorkspaces(ctx context.Context, client coder.Client, email string) ([]coder.Workspace, error) {
 	user, err := client.UserByEmail(ctx, email)
@@ -215,11 +220,9 @@ func getWorkspacesByProvider(ctx context.Context, client coder.Client, wpName, u
 		return nil, err
 	}
 
-	if userEmail != "" {
-		workspaces, err = filterWorkspacesByUser(ctx, client, userEmail, workspaces)
-		if err != nil {
-			return nil, err
-		}
+	workspaces, err = filterWorkspacesByUser(ctx, client, userEmail, workspaces)
+	if err != nil {
+		return nil, err
 	}
 
 	return workspaces, nil
diff --git a/internal/cmd/workspaces.go b/internal/cmd/workspaces.go
@@ -87,21 +87,24 @@ func lsWorkspacesCommand() *cobra.Command {
 				return err
 			}
 			var workspaces []coder.Workspace
-			if !all {
+			if all {
 				var err error
-				workspaces, err = getWorkspaces(ctx, client, user)
+				workspaces, err = getAllWorkspaces(ctx, client)
 				if err != nil {
 					return err
 				}
-			} else {
-				// If the user gave the all flag, then filtering by user doesn't make sense.
-				user = ""
-			}
-			if provider != "" || all {
+			} else if provider != "" {
+				var err error
 				workspaces, err = getWorkspacesByProvider(ctx, client, provider, user)
 				if err != nil {
 					return err
 				}
+			} else {
+				var err error
+				workspaces, err = getWorkspaces(ctx, client, user)
+				if err != nil {
+					return err
+				}
 			}
 			if len(workspaces) < 1 {
 				clog.LogInfo("no workspaces found")
