From 4a36e4ee24b520196414e178ac07bea07d9b8a96 Mon Sep 17 00:00:00 2001
From: Blake Covarrubias <blake@covarrubi.as>
Date: Tue, 4 Jan 2022 12:44:43 -0800
Subject: [PATCH] cli: Show node identities in acl token list output (#11926)

Fix the pretty CLI output of `consul acl token list` so that it
properly displays node identities that are associated with a token.
---
 .changelog/11926.txt                           |  3 +++
 command/acl/token/formatter.go                 | 10 +++-------
 .../FormatTokenList/complex.pretty-meta.golden |  4 ++--
 .../FormatTokenList/complex.pretty.golden      |  4 ++--
 website/content/commands/acl/token/list.mdx    | 18 ++++++++++--------
 5 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 .changelog/11926.txt

diff --git a/.changelog/11926.txt b/.changelog/11926.txt
new file mode 100644
index 000000000..29ce1b043
--- /dev/null
+++ b/.changelog/11926.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Display assigned node identities in output of `consul acl token list`.
+```
diff --git a/command/acl/token/formatter.go b/command/acl/token/formatter.go
index ad6d3ae79..e88ee28ba 100644
--- a/command/acl/token/formatter.go
+++ b/command/acl/token/formatter.go
@@ -173,13 +173,9 @@ func (f *prettyFormatter) formatTokenListEntry(token *api.ACLTokenListEntry) str
 		}
 	}
 	if len(token.NodeIdentities) > 0 {
-		buffer.WriteString(fmt.Sprintln("Service Identities:"))
-		for _, svcid := range token.ServiceIdentities {
-			if len(svcid.Datacenters) > 0 {
-				buffer.WriteString(fmt.Sprintf("   %s (Datacenters: %s)\n", svcid.ServiceName, strings.Join(svcid.Datacenters, ", ")))
-			} else {
-				buffer.WriteString(fmt.Sprintf("   %s (Datacenters: all)\n", svcid.ServiceName))
-			}
+		buffer.WriteString(fmt.Sprintln("Node Identities:"))
+		for _, nodeid := range token.NodeIdentities {
+			buffer.WriteString(fmt.Sprintf("   %s (Datacenter: %s)\n", nodeid.NodeName, nodeid.Datacenter))
 		}
 	}
 	return buffer.String()
diff --git a/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden b/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden
index 7ef9e8a55..11e05cfe4 100644
--- a/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden
+++ b/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden
@@ -18,5 +18,5 @@ Roles:
    6c9d1e1d-34bc-4d55-80f3-add0890ad791 - west-farthing
 Service Identities:
    gardener (Datacenters: middleearth-northwest)
-Service Identities:
-   gardener (Datacenters: middleearth-northwest)
+Node Identities:
+   bagend (Datacenter: middleearth-northwest)
diff --git a/command/acl/token/testdata/FormatTokenList/complex.pretty.golden b/command/acl/token/testdata/FormatTokenList/complex.pretty.golden
index 9005d254b..596d7aba0 100644
--- a/command/acl/token/testdata/FormatTokenList/complex.pretty.golden
+++ b/command/acl/token/testdata/FormatTokenList/complex.pretty.golden
@@ -15,5 +15,5 @@ Roles:
    6c9d1e1d-34bc-4d55-80f3-add0890ad791 - west-farthing
 Service Identities:
    gardener (Datacenters: middleearth-northwest)
-Service Identities:
-   gardener (Datacenters: middleearth-northwest)
+Node Identities:
+   bagend (Datacenter: middleearth-northwest)
diff --git a/website/content/commands/acl/token/list.mdx b/website/content/commands/acl/token/list.mdx
index bca01c369..2458a102e 100644
--- a/website/content/commands/acl/token/list.mdx
+++ b/website/content/commands/acl/token/list.mdx
@@ -46,14 +46,6 @@ Legacy:       false
 Policies:
    00000000-0000-0000-0000-000000000001 - global-management
 
-AccessorID:   59f86a9b-d3b6-166c-32a0-be4ab3f94caa
-Description:  Super User
-Local:        false
-Create Time:  2018-10-22 15:35:28.787003 -0400 EDT
-Legacy:       false
-Policies:
-   00000000-0000-0000-0000-000000000001 - global-management
-
 AccessorID:   00000000-0000-0000-0000-000000000002
 Description:  Anonymous Token
 Local:        false
@@ -69,4 +61,14 @@ Create Time:  2018-10-22 15:33:39.01789 -0400 EDT
 Legacy:       false
 Policies:
    06acc965-df4b-5a99-58cb-3250930c6324 - node-services-read
+Service Identities:
+   wonderservice (Datacenters: all)
+
+AccessorID:       def4895d-eeb9-f78a-fbb9-2a15a568af31
+Description:      Node 1 agent token
+Local:            false
+Create Time:      2020-12-22 04:19:30.552528733 +0000 UTC
+Legacy:           false
+Node Identities:
+   node1 (Datacenter: dc1)
 ```