fix: convert the rest of existing empty handling

mafredri · mafredri · commit 5f3fd1c0f7bd · 2025-11-27T12:49:20.000Z
diff --git a/cli/cliui/output.go b/cli/cliui/output.go
@@ -153,13 +153,6 @@ func (f *tableFormat) AttachOptions(opts *serpent.OptionSet) {
 
 // Format implements OutputFormat.
 func (f *tableFormat) Format(_ context.Context, data any) (string, error) {
-	// Return empty string for empty data. Callers should check for this
-	// and provide an appropriate message to the user.
-	v := reflect.Indirect(reflect.ValueOf(data))
-	if v.Kind() == reflect.Slice && v.Len() == 0 {
-		return "", nil
-	}
-
 	headers := make(table.Row, len(f.allColumns))
 	for i, header := range f.allColumns {
 		headers[i] = header
diff --git a/cli/cliui/output_test.go b/cli/cliui/output_test.go
@@ -136,24 +136,3 @@ func Test_OutputFormatter(t *testing.T) {
 		require.EqualValues(t, 2, atomic.LoadInt64(&called))
 	})
 }
-
-type tableFormatTestRow struct {
-	Name string `table:"name,default_sort"`
-	Age  int    `table:"age"`
-}
-
-func Test_TableFormat_EmptyData(t *testing.T) {
-	t.Parallel()
-
-	f := cliui.NewOutputFormatter(
-		cliui.TableFormat([]tableFormatTestRow{}, nil),
-		cliui.JSONFormat(),
-	)
-
-	ctx := context.Background()
-	var emptyData []tableFormatTestRow
-
-	out, err := f.Format(ctx, emptyData)
-	require.NoError(t, err)
-	require.Equal(t, "", out)
-}
diff --git a/cli/cliui/table.go b/cli/cliui/table.go
@@ -180,6 +180,12 @@ func DisplayTable(out any, sort string, filterColumns []string) (string, error)
 func renderTable(out any, sort string, headers table.Row, filterColumns []string) (string, error) {
 	v := reflect.Indirect(reflect.ValueOf(out))
 
+	// Return empty string for empty data. Callers should check for this
+	// and provide an appropriate message to the user.
+	if v.Kind() == reflect.Slice && v.Len() == 0 {
+		return "", nil
+	}
+
 	headers = filterHeaders(headers, filterColumns)
 	columnConfigs := createColumnConfigs(headers, filterColumns)
 
diff --git a/cli/cliui/table_test.go b/cli/cliui/table_test.go
@@ -472,6 +472,15 @@ alice  1
 		require.NoError(t, err)
 		compareTables(t, expected, out)
 	})
+
+	t.Run("Empty", func(t *testing.T) {
+		t.Parallel()
+
+		var in []tableTest4
+		out, err := cliui.DisplayTable(in, "", nil)
+		require.NoError(t, err)
+		require.Empty(t, out)
+	})
 }
 
 // compareTables normalizes the incoming table lines
diff --git a/cli/organizationmembers.go b/cli/organizationmembers.go
@@ -170,6 +170,11 @@ func (r *RootCmd) listOrganizationMembers(orgContext *OrganizationContext) *serp
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No organization members found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/organizationroles.go b/cli/organizationroles.go
@@ -92,6 +92,11 @@ func (r *RootCmd) showOrganizationRoles(orgContext *OrganizationContext) *serpen
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No organization roles found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/provisionerjobs.go b/cli/provisionerjobs.go
@@ -110,6 +110,11 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
 				return xerrors.Errorf("display provisioner daemons: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No provisioner jobs found.")
+				return nil
+			}
+
 			_, _ = fmt.Fprintln(inv.Stdout, out)
 
 			return nil
diff --git a/cli/provisioners.go b/cli/provisioners.go
@@ -74,11 +74,6 @@ func (r *RootCmd) provisionerList() *serpent.Command {
 				return xerrors.Errorf("list provisioner daemons: %w", err)
 			}
 
-			if len(daemons) == 0 {
-				_, _ = fmt.Fprintln(inv.Stdout, "No provisioner daemons found")
-				return nil
-			}
-
 			var rows []provisionerDaemonRow
 			for _, daemon := range daemons {
 				rows = append(rows, provisionerDaemonRow{
@@ -92,6 +87,11 @@ func (r *RootCmd) provisionerList() *serpent.Command {
 				return xerrors.Errorf("display provisioner daemons: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No provisioner daemons found.")
+				return nil
+			}
+
 			_, _ = fmt.Fprintln(inv.Stdout, out)
 
 			return nil
diff --git a/cli/schedule.go b/cli/schedule.go
@@ -129,6 +129,11 @@ func (r *RootCmd) scheduleShow() *serpent.Command {
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No schedules found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/task_logs.go b/cli/task_logs.go
@@ -59,6 +59,11 @@ func (r *RootCmd) taskLogs() *serpent.Command {
 				return xerrors.Errorf("format task logs: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No task logs found.")
+				return nil
+			}
+
 			_, _ = fmt.Fprintln(inv.Stdout, out)
 			return nil
 		},
diff --git a/cli/templatelist.go b/cli/templatelist.go
@@ -30,18 +30,18 @@ func (r *RootCmd) templateList() *serpent.Command {
 				return err
 			}
 
-			if len(templates) == 0 {
-				_, _ = fmt.Fprintf(inv.Stderr, "%s No templates found! Create one:\n\n", Caret)
-				_, _ = fmt.Fprintln(inv.Stderr, color.HiMagentaString("  $ coder templates push <directory>\n"))
-				return nil
-			}
-
 			rows := templatesToRows(templates...)
 			out, err := formatter.Format(inv.Context(), rows)
 			if err != nil {
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintf(inv.Stderr, "%s No templates found! Create one:\n\n", Caret)
+				_, _ = fmt.Fprintln(inv.Stderr, color.HiMagentaString("  $ coder templates push <directory>\n"))
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/templatepresets.go b/cli/templatepresets.go
@@ -124,6 +124,11 @@ func (r *RootCmd) templatePresetsList() *serpent.Command {
 				return xerrors.Errorf("render table: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No template presets found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/templateversions.go b/cli/templateversions.go
@@ -121,6 +121,11 @@ func (r *RootCmd) templateVersionsList() *serpent.Command {
 				return xerrors.Errorf("render table: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No template versions found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/tokens.go b/cli/tokens.go
@@ -246,13 +246,6 @@ func (r *RootCmd) listTokens() *serpent.Command {
 				return xerrors.Errorf("list tokens: %w", err)
 			}
 
-			if len(tokens) == 0 {
-				cliui.Infof(
-					inv.Stdout,
-					"No tokens found.\n",
-				)
-			}
-
 			displayTokens = make([]tokenListRow, len(tokens))
 
 			for i, token := range tokens {
@@ -264,6 +257,11 @@ func (r *RootCmd) listTokens() *serpent.Command {
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No tokens found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/cli/userlist.go b/cli/userlist.go
@@ -58,6 +58,11 @@ func (r *RootCmd) userList() *serpent.Command {
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No users found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/enterprise/cli/grouplist.go b/enterprise/cli/grouplist.go
@@ -43,18 +43,18 @@ func (r *RootCmd) groupList() *serpent.Command {
 				return xerrors.Errorf("get groups: %w", err)
 			}
 
-			if len(groups) == 0 {
-				_, _ = fmt.Fprintf(inv.Stderr, "%s No groups found in %s! Create one:\n\n", agpl.Caret, color.HiWhiteString(org.Name))
-				_, _ = fmt.Fprintln(inv.Stderr, color.HiMagentaString("  $ coder groups create <name>\n"))
-				return nil
-			}
-
 			rows := groupsToRows(groups...)
 			out, err := formatter.Format(inv.Context(), rows)
 			if err != nil {
 				return xerrors.Errorf("display groups: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintf(inv.Stderr, "%s No groups found in %s! Create one:\n\n", agpl.Caret, color.HiWhiteString(org.Name))
+				_, _ = fmt.Fprintln(inv.Stderr, color.HiMagentaString("  $ coder groups create <name>\n"))
+				return nil
+			}
+
 			_, _ = fmt.Fprintln(inv.Stdout, out)
 			return nil
 		},
diff --git a/enterprise/cli/licenses.go b/enterprise/cli/licenses.go
@@ -166,6 +166,11 @@ func (r *RootCmd) licensesList() *serpent.Command {
 				return err
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No licenses found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, out)
 			return err
 		},
diff --git a/enterprise/cli/provisionerkeys.go b/enterprise/cli/provisionerkeys.go
@@ -126,16 +126,16 @@ func (r *RootCmd) provisionerKeysList() *serpent.Command {
 				return xerrors.Errorf("list provisioner keys: %w", err)
 			}
 
-			if len(keys) == 0 {
-				_, _ = fmt.Fprintln(inv.Stdout, "No provisioner keys found")
-				return nil
-			}
-
 			out, err := formatter.Format(inv.Context(), keys)
 			if err != nil {
 				return xerrors.Errorf("display provisioner keys: %w", err)
 			}
 
+			if out == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No provisioner keys found.")
+				return nil
+			}
+
 			_, _ = fmt.Fprintln(inv.Stdout, out)
 
 			return nil
diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go
@@ -392,6 +392,11 @@ func (r *RootCmd) listProxies() *serpent.Command {
 				return err
 			}
 
+			if output == "" {
+				_, _ = fmt.Fprintln(inv.Stderr, "No workspace proxies found.")
+				return nil
+			}
+
 			_, err = fmt.Fprintln(inv.Stdout, output)
 			return err
 		},
