Option to list all workspaces

goodspark · goodspark · commit fc3336c14017 · 2021-08-12T05:30:31.000Z
From an admin POV, this will be helpful for various reasons.
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -215,10 +215,13 @@ func getWorkspacesByProvider(ctx context.Context, client coder.Client, wpName, u
 		return nil, err
 	}
 
-	workspaces, err = filterWorkspacesByUser(ctx, client, userEmail, workspaces)
-	if err != nil {
-		return nil, err
+	if userEmail != "" {
+		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
@@ -70,6 +70,7 @@ const (
 
 func lsWorkspacesCommand() *cobra.Command {
 	var (
+		all       bool
 		outputFmt string
 		user      string
 		provider  string
@@ -85,11 +86,18 @@ func lsWorkspacesCommand() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			workspaces, err := getWorkspaces(ctx, client, user)
-			if err != nil {
-				return err
+			var workspaces []coder.Workspace
+			if !all {
+				var err error
+				workspaces, err = getWorkspaces(ctx, client, user)
+				if err != nil {
+					return err
+				}
+			} else {
+				// If the user gave the all flag, then filtering by user doesn't make sense.
+				user = ""
 			}
-			if provider != "" {
+			if provider != "" || all {
 				workspaces, err = getWorkspacesByProvider(ctx, client, provider, user)
 				if err != nil {
 					return err
@@ -124,6 +132,7 @@ func lsWorkspacesCommand() *cobra.Command {
 		},
 	}
 
+	cmd.Flags().BoolVar(&all, "all", false, "Get workspaces for all users")
 	cmd.Flags().StringVar(&user, "user", coder.Me, "Specify the user whose resources to target")
 	cmd.Flags().StringVarP(&outputFmt, "output", "o", humanOutput, "human | json")
 	cmd.Flags().StringVarP(&provider, "provider", "p", "", "Filter workspaces by a particular workspace provider name.")
diff --git a/internal/cmd/workspaces_test.go b/internal/cmd/workspaces_test.go
@@ -29,6 +29,34 @@ func Test_workspaces_ls(t *testing.T) {
 	res.stdoutUnmarshals(t, &workspaces)
 }
 
+func Test_workspaces_ls_all(t *testing.T) {
+	skipIfNoAuth(t)
+	for _, test := range []struct {
+		name    string
+		command []string
+		assert  func(r result)
+	}{
+		{
+			name:    "simple list",
+			command: []string{"workspaces", "ls", "--all"},
+			assert:  func(r result) { r.success(t) },
+		},
+		{
+			name:    "list as json",
+			command: []string{"workspaces", "ls", "--all", "--output", "json"},
+			assert: func(r result) {
+				var workspaces []coder.Workspace
+				r.stdoutUnmarshals(t, &workspaces)
+			},
+		},
+	} {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			test.assert(execute(t, nil, test.command...))
+		})
+	}
+}
+
 func Test_workspaces_ls_by_provider(t *testing.T) {
 	skipIfNoAuth(t)
 	for _, test := range []struct {

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,13 @@ func getWorkspacesByProvider(ctx context.Context, client coder.Client, wpName, u`
`215`	`215`	`return nil, err`
`216`	`216`	`}`
`217`	`217`
`218`		`- workspaces, err = filterWorkspacesByUser(ctx, client, userEmail, workspaces)`
`219`		`- if err != nil {`
`220`		`- return nil, err`
	`218`	`+ if userEmail != "" {`
	`219`	`+ workspaces, err = filterWorkspacesByUser(ctx, client, userEmail, workspaces)`
	`220`	`+ if err != nil {`
	`221`	`+ return nil, err`
	`222`	`+ }`
`221`	`223`	`}`
	`224`	`+`
`222`	`225`	`return workspaces, nil`
`223`	`226`	`}`
`224`	`227`