Skip to content

Commit aeff3bc

Browse files
mafredrimafredri
committed
fix: convert the rest of existing empty handling
1 parent f4d2677 commit aeff3bc

15 files changed

+77
-29
lines changed

‎cli/organizationmembers.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ func (r *RootCmd) listOrganizationMembers(orgContext *OrganizationContext) *serp
170170
return err
171171
}
172172

173+
if out == "" {
174+
_, _ = fmt.Fprintln(inv.Stderr, "No organization members found.")
175+
return nil
176+
}
177+
173178
_, err = fmt.Fprintln(inv.Stdout, out)
174179
return err
175180
},

‎cli/organizationroles.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ func (r *RootCmd) showOrganizationRoles(orgContext *OrganizationContext) *serpen
9292
return err
9393
}
9494

95+
if out == "" {
96+
_, _ = fmt.Fprintln(inv.Stderr, "No organization roles found.")
97+
return nil
98+
}
99+
95100
_, err = fmt.Fprintln(inv.Stdout, out)
96101
return err
97102
},

‎cli/provisionerjobs.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
110110
return xerrors.Errorf("display provisioner daemons: %w", err)
111111
}
112112

113+
if out == "" {
114+
_, _ = fmt.Fprintln(inv.Stderr, "No provisioner jobs found.")
115+
return nil
116+
}
117+
113118
_, _ = fmt.Fprintln(inv.Stdout, out)
114119

115120
return nil

‎cli/provisioners.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ func (r *RootCmd) provisionerList() *serpent.Command {
7474
return xerrors.Errorf("list provisioner daemons: %w", err)
7575
}
7676

77-
if len(daemons) == 0 {
78-
_, _ = fmt.Fprintln(inv.Stdout, "No provisioner daemons found")
79-
return nil
80-
}
81-
8277
var rows []provisionerDaemonRow
8378
for _, daemon := range daemons {
8479
rows = append(rows, provisionerDaemonRow{
@@ -92,6 +87,11 @@ func (r *RootCmd) provisionerList() *serpent.Command {
9287
return xerrors.Errorf("display provisioner daemons: %w", err)
9388
}
9489

90+
if out == "" {
91+
_, _ = fmt.Fprintln(inv.Stderr, "No provisioner daemons found.")
92+
return nil
93+
}
94+
9595
_, _ = fmt.Fprintln(inv.Stdout, out)
9696

9797
return nil

‎cli/schedule.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ func (r *RootCmd) scheduleShow() *serpent.Command {
129129
return err
130130
}
131131

132+
if out == "" {
133+
_, _ = fmt.Fprintln(inv.Stderr, "No schedules found.")
134+
return nil
135+
}
136+
132137
_, err = fmt.Fprintln(inv.Stdout, out)
133138
return err
134139
},

‎cli/task_logs.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ func (r *RootCmd) taskLogs() *serpent.Command {
5959
return xerrors.Errorf("format task logs: %w", err)
6060
}
6161

62+
if out == "" {
63+
_, _ = fmt.Fprintln(inv.Stderr, "No task logs found.")
64+
return nil
65+
}
66+
6267
_, _ = fmt.Fprintln(inv.Stdout, out)
6368
return nil
6469
},

‎cli/templatelist.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ func (r *RootCmd) templateList() *serpent.Command {
3030
return err
3131
}
3232

33-
if len(templates) == 0 {
34-
_, _ = fmt.Fprintf(inv.Stderr, "%s No templates found! Create one:\n\n", Caret)
35-
_, _ = fmt.Fprintln(inv.Stderr, color.HiMagentaString(" $ coder templates push <directory>\n"))
36-
return nil
37-
}
38-
3933
rows := templatesToRows(templates...)
4034
out, err := formatter.Format(inv.Context(), rows)
4135
if err != nil {
4236
return err
4337
}
4438

39+
if out == "" {
40+
_, _ = fmt.Fprintf(inv.Stderr, "%s No templates found! Create one:\n\n", Caret)
41+
_, _ = fmt.Fprintln(inv.Stderr, color.HiMagentaString(" $ coder templates push <directory>\n"))
42+
return nil
43+
}
44+
4545
_, err = fmt.Fprintln(inv.Stdout, out)
4646
return err
4747
},

‎cli/templatepresets.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ func (r *RootCmd) templatePresetsList() *serpent.Command {
124124
return xerrors.Errorf("render table: %w", err)
125125
}
126126

127+
if out == "" {
128+
_, _ = fmt.Fprintln(inv.Stderr, "No template presets found.")
129+
return nil
130+
}
131+
127132
_, err = fmt.Fprintln(inv.Stdout, out)
128133
return err
129134
},

‎cli/templateversions.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ func (r *RootCmd) templateVersionsList() *serpent.Command {
121121
return xerrors.Errorf("render table: %w", err)
122122
}
123123

124+
if out == "" {
125+
_, _ = fmt.Fprintln(inv.Stderr, "No template versions found.")
126+
return nil
127+
}
128+
124129
_, err = fmt.Fprintln(inv.Stdout, out)
125130
return err
126131
},

‎cli/tokens.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,6 @@ func (r *RootCmd) listTokens() *serpent.Command {
246246
return xerrors.Errorf("list tokens: %w", err)
247247
}
248248

249-
if len(tokens) == 0 {
250-
cliui.Infof(
251-
inv.Stdout,
252-
"No tokens found.\n",
253-
)
254-
}
255-
256249
displayTokens = make([]tokenListRow, len(tokens))
257250

258251
for i, token := range tokens {
@@ -264,6 +257,11 @@ func (r *RootCmd) listTokens() *serpent.Command {
264257
return err
265258
}
266259

260+
if out == "" {
261+
_, _ = fmt.Fprintln(inv.Stderr, "No tokens found.")
262+
return nil
263+
}
264+
267265
_, err = fmt.Fprintln(inv.Stdout, out)
268266
return err
269267
},

0 commit comments

Comments
 (0)