Skip to content

Commit a152b62

Browse files
committed
BUG/MAJOR: users: fix panic when insecure isn't set
1 parent ddcd663 commit a152b62

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

configuration/user.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,18 @@ func (u *Users) Init() error {
8383
mode := configuration.Mode.Load()
8484
allUsers := configuration.GetUsers() // single + cluster mode
8585
if len(allUsers) > 0 {
86-
for _, user := range allUsers {
87-
if mode != ModeCluster || strings.HasPrefix(user.Name, storagetype.DapiClusterUserPrefix) {
88-
u.users = append(u.users, types.User{
89-
Name: user.Name,
90-
IsInsecure: *user.Insecure,
91-
Password: *user.Password,
92-
})
86+
for _, storageUser := range allUsers {
87+
if mode != ModeCluster || strings.HasPrefix(storageUser.Name, storagetype.DapiClusterUserPrefix) {
88+
user := types.User{
89+
Name: storageUser.Name,
90+
}
91+
if storageUser.Password != nil {
92+
user.Password = *storageUser.Password
93+
}
94+
if storageUser.Insecure != nil {
95+
user.IsInsecure = *storageUser.Insecure
96+
}
97+
u.users = append(u.users, user)
9398
}
9499
}
95100
return nil

0 commit comments

Comments
 (0)