Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-1.8] Fix: list user projects panic #812

Merged
merged 1 commit into from
May 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions pkg/server/domain/service/user.go
Original file line number Diff line number Diff line change
@@ -228,35 +228,42 @@ func (u *userServiceImpl) GenerateUserProjects(ctx context.Context, user *model.
var projects []*apisv1.UserProjectBase
for _, v := range projectUsers {
pu, ok := v.(*model.ProjectUser)
if ok {
project, err := u.ProjectService.DetailProject(ctx, pu.ProjectName)
if err != nil {
klog.Errorf("failed to delete project(%s) info: %s", pu.ProjectName, err.Error())
continue
}
roles, _ := u.RbacService.ListRole(ctx, project.Name, 0, 0)
var roleAlias = make(map[string]string)
for _, r := range roles.Roles {
roleAlias[r.Name] = r.Alias
}
projects = append(projects, &apisv1.UserProjectBase{
Name: project.Name,
Alias: project.Alias,
Owner: project.Owner,
Description: project.Description,
JoinTime: pu.CreateTime,
Roles: func() []apisv1.NameAlias {
var roles []apisv1.NameAlias
for _, r := range pu.UserRoles {
roles = append(roles, apisv1.NameAlias{
Name: r,
Alias: roleAlias[r],
})
}
return roles
}(),
})
if !ok {
klog.Errorf("failed to convert project user")
continue
}
project, err := u.ProjectService.DetailProject(ctx, pu.ProjectName)
if err != nil {
klog.Errorf("failed to delete project(%s) info: %s", pu.ProjectName, err.Error())
continue
}
roles, err := u.RbacService.ListRole(ctx, project.Name, 0, 0)
if err != nil {
klog.Errorf("failed to list project(%s) roles: %s", project.Name, err.Error())
continue
}

var roleAlias = make(map[string]string)
for _, r := range roles.Roles {
roleAlias[r.Name] = r.Alias
}
projects = append(projects, &apisv1.UserProjectBase{
Name: project.Name,
Alias: project.Alias,
Owner: project.Owner,
Description: project.Description,
JoinTime: pu.CreateTime,
Roles: func() []apisv1.NameAlias {
var roles []apisv1.NameAlias
for _, r := range pu.UserRoles {
roles = append(roles, apisv1.NameAlias{
Name: r,
Alias: roleAlias[r],
})
}
return roles
}(),
})
}
return projectUsers, projects, nil
}