TUN-4150: Only show the connector table in 'tunnel info' if there are connectors. Don't show rows with zero connections.
This commit is contained in:
parent
8ca0d86c85
commit
5afa3251dd
|
@ -454,14 +454,30 @@ func formatAndPrintConnectionsList(tunnelInfo Info, showRecentlyDisconnected boo
|
||||||
writer := tabWriter()
|
writer := tabWriter()
|
||||||
defer writer.Flush()
|
defer writer.Flush()
|
||||||
|
|
||||||
|
// Print the general tunnel info table
|
||||||
_, _ = fmt.Fprintf(writer, "NAME: %s\nID: %s\nCREATED: %s\n\n", tunnelInfo.Name, tunnelInfo.ID, tunnelInfo.CreatedAt)
|
_, _ = fmt.Fprintf(writer, "NAME: %s\nID: %s\nCREATED: %s\n\n", tunnelInfo.Name, tunnelInfo.ID, tunnelInfo.CreatedAt)
|
||||||
|
|
||||||
|
// Determine whether to print the connector table
|
||||||
|
shouldDisplayTable := false
|
||||||
|
for _, c := range tunnelInfo.Connectors {
|
||||||
|
conns := fmtConnections(c.Connections, showRecentlyDisconnected)
|
||||||
|
if len(conns) > 0 {
|
||||||
|
shouldDisplayTable = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !shouldDisplayTable {
|
||||||
|
fmt.Println("This tunnel has no active connectors.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print the connector table
|
||||||
_, _ = fmt.Fprintln(writer, "CONNECTOR ID\tCREATED\tARCHITECTURE\tVERSION\tORIGIN IP\tEDGE\t")
|
_, _ = fmt.Fprintln(writer, "CONNECTOR ID\tCREATED\tARCHITECTURE\tVERSION\tORIGIN IP\tEDGE\t")
|
||||||
for _, c := range tunnelInfo.Connectors {
|
for _, c := range tunnelInfo.Connectors {
|
||||||
var originIp = ""
|
conns := fmtConnections(c.Connections, showRecentlyDisconnected)
|
||||||
if len(c.Connections) > 0 {
|
if len(conns) == 0 {
|
||||||
originIp = c.Connections[0].OriginIP.String()
|
continue
|
||||||
}
|
}
|
||||||
|
originIp := c.Connections[0].OriginIP.String()
|
||||||
formattedStr := fmt.Sprintf(
|
formattedStr := fmt.Sprintf(
|
||||||
"%s\t%s\t%s\t%s\t%s\t%s\t",
|
"%s\t%s\t%s\t%s\t%s\t%s\t",
|
||||||
c.ID,
|
c.ID,
|
||||||
|
@ -469,7 +485,7 @@ func formatAndPrintConnectionsList(tunnelInfo Info, showRecentlyDisconnected boo
|
||||||
c.Arch,
|
c.Arch,
|
||||||
c.Version,
|
c.Version,
|
||||||
originIp,
|
originIp,
|
||||||
fmtConnections(c.Connections, showRecentlyDisconnected),
|
conns,
|
||||||
)
|
)
|
||||||
_, _ = fmt.Fprintln(writer, formattedStr)
|
_, _ = fmt.Fprintln(writer, formattedStr)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue