Skip to content

Commit 99a8d14

Browse files
committed
BUG/MINOR: userlists: fix ordering of users in userlist serialization
1 parent d5cd2af commit 99a8d14

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

configuration/structured_userlists.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package configuration
1717

1818
import (
1919
"fmt"
20+
"sort"
2021

2122
"github.com/go-openapi/strfmt"
2223
parser "github.com/haproxytech/client-native/v6/config-parser"
@@ -161,7 +162,13 @@ func serializeUserlistSection(a StructuredToParserArgs, u *models.Userlist) erro
161162
return err
162163
}
163164

164-
for _, user := range u.Users {
165+
userNames := make([]string, 0, len(u.Users))
166+
for name := range u.Users {
167+
userNames = append(userNames, name)
168+
}
169+
sort.Strings(userNames)
170+
for _, username := range userNames {
171+
user := u.Users[username]
165172
if err = p.Insert(parser.UserList, u.Name, "user", SerializeUser(user), -1); err != nil {
166173
return a.HandleError(user.Username, "userlist", u.Name, a.TID, a.TID == "", err)
167174
}

0 commit comments

Comments
 (0)