Fix regression in returning empty value for approle cidrlist. (#13235) (

#13251)
hashicorp · Nov 23, 2021 · 34aa9a0 · 34aa9a0
1 parent 3b8ac39
commit 34aa9a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/builtin/credential/approle/validation.go b/builtin/credential/approle/validation.go
@@ -118,6 +118,11 @@ func decodeSecretIDStorageEntry(entry *logical.StorageEntry) (*secretIDStorageEn
 	}
 
 	cleanup := func(in []string) []string {
+		if len(in) == 0 {
+			// Don't change unnecessarily, if it was empty list leave as empty list
+			// instead of making it nil.
+			return in
+		}
 		var out []string
 		for _, s := range in {
 			out = append(out, parseip.TrimLeadingZeroesCIDR(s))

diff --git a/changelog/13235.txt b/changelog/13235.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+auth/approle: Fix regression where unset cidrlist is returned as nil instead of zero-length array.
+```