|
@@ -672,25 +672,25 @@ func TestRolesOrder(t *testing.T) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
username := "user"
|
|
username := "user"
|
|
|
- _, err = as.UserAdd(&pb.AuthUserAddRequest{username, "pass"})
|
|
|
|
|
|
|
+ _, err = as.UserAdd(&pb.AuthUserAddRequest{Name: username, Password: "pass"})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
roles := []string{"role1", "role2", "abc", "xyz", "role3"}
|
|
roles := []string{"role1", "role2", "abc", "xyz", "role3"}
|
|
|
for _, role := range roles {
|
|
for _, role := range roles {
|
|
|
- _, err = as.RoleAdd(&pb.AuthRoleAddRequest{role})
|
|
|
|
|
|
|
+ _, err = as.RoleAdd(&pb.AuthRoleAddRequest{Name: role})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- _, err = as.UserGrantRole(&pb.AuthUserGrantRoleRequest{username, role})
|
|
|
|
|
|
|
+ _, err = as.UserGrantRole(&pb.AuthUserGrantRoleRequest{User: username, Role: role})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- user, err := as.UserGet(&pb.AuthUserGetRequest{username})
|
|
|
|
|
|
|
+ user, err := as.UserGet(&pb.AuthUserGetRequest{Name: username})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
|
}
|
|
}
|