Merge pull request #1054 from ripienaar/watch_account_name

Render account name in account watch command

cli/auth_command.go

@@ -26,7 +26,6 @@ func configureAuthCommand(app commandHost) {
 	auth := app.Command("auth", "NATS Decentralized Authentication")
 
 	// todo:
-	//  - store role name, currently its the pub key not name
 	//  - Improve maintaining pub/sub permissions for a user, perhaps allow interactive edits of yaml?
 
 	auth.HelpLong("WARNING: This is experimental and subject to massive change, do not use yet")

cli/server_watch_acct_command.go

@@ -176,9 +176,15 @@ func (c *SrvWatchAccountCmd) redraw() {
 		matched = accounts[:c.topCount]
 	}
 
+	clearScreen()
 	for _, account := range matched {
+		acct := account.Account
+		if account.Name != "" {
+			acct = account.Name
+		}
+
 		table.AddRow(
-			account.Account,
+			acct,
 			seen[account.Account],
 			f(account.Conns),
 			f(account.LeafNodes),
@@ -189,7 +195,6 @@ func (c *SrvWatchAccountCmd) redraw() {
 		)
 	}
 
-	clearScreen()
 	fmt.Println(table.Render())
 }
 
@@ -212,6 +217,7 @@ func (c *SrvWatchAccountCmd) accountTotal(acct string) (int, *server.AccountStat
 		servers++
 
 		total.Account = acct
+		total.Name = stat.Name
 		total.TotalConns += stat.TotalConns
 		total.Conns += stat.Conns
 		total.LeafNodes += stat.LeafNodes