Skip to content

Commit a208948

Browse files
committed
add more pretty output in pod subcommand
1 parent 324db55 commit a208948

File tree

2 files changed

+59
-7
lines changed

2 files changed

+59
-7
lines changed

commands/node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ func getNode(c *cli.Context) error {
270270
if node.GetInitStorage() > 0 {
271271
log.Infof("Storage Used: %d bytes", node.GetStorageUsed())
272272
} else {
273-
log.Infof("Storage Used: %d bytes (unlimited)", node.GetStorageUsed())
273+
log.Infof("Storage Used: %d bytes (%s)", node.GetStorageUsed(), unlimited)
274274
}
275275
return nil
276276
}

commands/pod.go

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,26 @@ func listPods(c *cli.Context) error {
8484
log.Fatalf("[ListPods] send request failed %v", err)
8585
}
8686

87-
for _, pod := range resp.GetPods() {
88-
log.Infof("Name: %s, Desc: %s", pod.GetName(), pod.GetDesc())
87+
if c.Bool("pretty") {
88+
t := table.NewWriter()
89+
t.SetOutputMirror(os.Stdout)
90+
t.AppendHeader(table.Row{"Name", "Description"})
91+
nameRow := []string{}
92+
descRow := []string{}
93+
for _, pod := range resp.GetPods() {
94+
nameRow = append(nameRow, pod.Name)
95+
descRow = append(descRow, pod.Desc)
96+
97+
}
98+
rows := [][]string{nameRow, descRow}
99+
t.AppendRows(toTableRows(rows))
100+
t.AppendSeparator()
101+
t.SetStyle(table.StyleLight)
102+
t.Render()
103+
} else {
104+
for _, pod := range resp.GetPods() {
105+
log.Infof("Name: %s, Desc: %s", pod.GetName(), pod.GetDesc())
106+
}
89107
}
90108
return nil
91109
}
@@ -193,8 +211,25 @@ func listPodNodes(c *cli.Context) error {
193211
return cli.Exit(err, -1)
194212
}
195213

196-
for _, node := range resp.GetNodes() {
197-
log.Infof("Name: %s, Endpoint: %s", node.GetName(), node.GetEndpoint())
214+
if c.Bool("pretty") {
215+
t := table.NewWriter()
216+
t.SetOutputMirror(os.Stdout)
217+
t.AppendHeader(table.Row{"Name", "Endpoint"})
218+
nameRow := []string{}
219+
endpointRow := []string{}
220+
for _, node := range resp.Nodes {
221+
nameRow = append(nameRow, node.Name)
222+
endpointRow = append(endpointRow, node.Endpoint)
223+
}
224+
rows := [][]string{nameRow, endpointRow}
225+
t.AppendRows(toTableRows(rows))
226+
t.AppendSeparator()
227+
t.SetStyle(table.StyleLight)
228+
t.Render()
229+
} else {
230+
for _, node := range resp.GetNodes() {
231+
log.Infof("Name: %s, Endpoint: %s", node.GetName(), node.GetEndpoint())
232+
}
198233
}
199234
return nil
200235
}
@@ -215,8 +250,25 @@ func listPodNetworks(c *cli.Context) error {
215250
return cli.Exit(err, -1)
216251
}
217252

218-
for _, network := range resp.GetNetworks() {
219-
log.Infof("Name: %s, Subnets: %s", network.GetName(), strings.Join(network.GetSubnets(), ","))
253+
if c.Bool("pretty") {
254+
t := table.NewWriter()
255+
t.SetOutputMirror(os.Stdout)
256+
t.AppendHeader(table.Row{"Name", "Network"})
257+
nameRow := []string{}
258+
networkRow := []string{}
259+
for _, network := range resp.Networks {
260+
nameRow = append(nameRow, network.Name)
261+
networkRow = append(networkRow, strings.Join(network.GetSubnets(), ","))
262+
}
263+
rows := [][]string{nameRow, networkRow}
264+
t.AppendRows(toTableRows(rows))
265+
t.AppendSeparator()
266+
t.SetStyle(table.StyleLight)
267+
t.Render()
268+
} else {
269+
for _, network := range resp.GetNetworks() {
270+
log.Infof("Name: %s, Subnets: %s", network.GetName(), strings.Join(network.GetSubnets(), ","))
271+
}
220272
}
221273
return nil
222274
}

0 commit comments

Comments
 (0)