Addition of json omitempty for ACLToken name field and its related structs (#23484)

pajay-rao · web-flow · commit df0bcba2524a · 2026-04-22T13:08:32.000+05:30
* Addition of json omitempty for ACLToken name field

* Fix testdata files
diff --git a/agent/structs/acl.go b/agent/structs/acl.go
@@ -577,7 +577,7 @@ func (t *ACLToken) EstimateSize() int {
 type ACLTokens []*ACLToken
 
 type ACLTokenListStub struct {
-	Name              string
+	Name              string `json:",omitempty"`
 	AccessorID        string
 	SecretID          string
 	Description       string
@@ -1165,7 +1165,7 @@ func (rules ACLBindingRules) Sort() {
 
 // Note: this is a subset of ACLAuthMethod's fields
 type ACLAuthMethodListStub struct {
-	Name            string
+	Name            string `json:",omitempty"`
 	Type            string
 	DisplayName     string        `json:",omitempty"`
 	Description     string        `json:",omitempty"`
diff --git a/api/acl.go b/api/acl.go
@@ -41,7 +41,7 @@ type ACLTokenRoleLink = ACLLink
 type ACLToken struct {
 	CreateIndex       uint64
 	ModifyIndex       uint64
-	Name              string
+	Name              string `json:",omitempty"`
 	AccessorID        string
 	SecretID          string
 	Description       string
@@ -89,7 +89,7 @@ type ACLTokenExpanded struct {
 }
 
 type ACLTokenListEntry struct {
-	Name              string
+	Name              string `json:",omitempty"`
 	CreateIndex       uint64
 	ModifyIndex       uint64
 	AccessorID        string
diff --git a/command/acl/token/testdata/FormatToken/basic.json.golden b/command/acl/token/testdata/FormatToken/basic.json.golden
@@ -1,7 +1,6 @@
 {
     "CreateIndex": 42,
     "ModifyIndex": 100,
-    "Name": "",
     "AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",
     "SecretID": "869c6e91-4de9-4dab-b56e-87548435f9c6",
     "Description": "test token",
diff --git a/command/acl/token/testdata/FormatToken/complex.json.golden b/command/acl/token/testdata/FormatToken/complex.json.golden
@@ -1,7 +1,6 @@
 {
     "CreateIndex": 5,
     "ModifyIndex": 10,
-    "Name": "",
     "AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",
     "SecretID": "869c6e91-4de9-4dab-b56e-87548435f9c6",
     "Description": "test token",
diff --git a/command/acl/token/testdata/FormatTokenExpanded/ce/basic.json.golden b/command/acl/token/testdata/FormatTokenExpanded/ce/basic.json.golden
@@ -29,7 +29,6 @@
     "ResolvedByAgent": "leader",
     "CreateIndex": 42,
     "ModifyIndex": 100,
-    "Name": "",
     "AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",
     "SecretID": "869c6e91-4de9-4dab-b56e-87548435f9c6",
     "Description": "test token",
diff --git a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden
@@ -144,7 +144,6 @@
     "ResolvedByAgent": "server-1",
     "CreateIndex": 5,
     "ModifyIndex": 10,
-    "Name": "",
     "AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",
     "SecretID": "869c6e91-4de9-4dab-b56e-87548435f9c6",
     "Description": "test token",
diff --git a/command/acl/token/testdata/FormatTokenList/basic.json.golden b/command/acl/token/testdata/FormatTokenList/basic.json.golden
@@ -1,6 +1,5 @@
 [
     {
-        "Name": "",
         "CreateIndex": 42,
         "ModifyIndex": 100,
         "AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",
diff --git a/command/acl/token/testdata/FormatTokenList/complex.json.golden b/command/acl/token/testdata/FormatTokenList/complex.json.golden
@@ -1,6 +1,5 @@
 [
     {
-        "Name": "",
         "CreateIndex": 5,
         "ModifyIndex": 10,
         "AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"CreateIndex": 42,`
`3`	`3`	`"ModifyIndex": 100,`
`4`		`- "Name": "",`
`5`	`4`	`"AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",`
`6`	`5`	`"SecretID": "869c6e91-4de9-4dab-b56e-87548435f9c6",`
`7`	`6`	`"Description": "test token",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"CreateIndex": 5,`
`3`	`3`	`"ModifyIndex": 10,`
`4`		`- "Name": "",`
`5`	`4`	`"AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",`
`6`	`5`	`"SecretID": "869c6e91-4de9-4dab-b56e-87548435f9c6",`
`7`	`6`	`"Description": "test token",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "Name": "",`
`4`	`3`	`"CreateIndex": 42,`
`5`	`4`	`"ModifyIndex": 100,`
`6`	`5`	`"AccessorID": "fbd2447f-7479-4329-ad13-b021d74f86ba",`