Skip to content

Commit

Permalink
Fix list user projects panic
Browse files Browse the repository at this point in the history
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
  • Loading branch information
chivalryq committed May 8, 2023
1 parent 847af3b commit 5801cf3
Showing 1 changed file with 35 additions and 28 deletions.
63 changes: 35 additions & 28 deletions pkg/server/domain/service/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Check warning on line 233 in pkg/server/domain/service/user.go

View check run for this annotation

Codecov / codecov/patch

pkg/server/domain/service/user.go#L232-L233

Added lines #L232 - L233 were not covered by tests
}
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

Check warning on line 238 in pkg/server/domain/service/user.go

View check run for this annotation

Codecov / codecov/patch

pkg/server/domain/service/user.go#L237-L238

Added lines #L237 - L238 were not covered by tests
}
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

Check warning on line 243 in pkg/server/domain/service/user.go

View check run for this annotation

Codecov / codecov/patch

pkg/server/domain/service/user.go#L242-L243

Added lines #L242 - L243 were not covered by tests
}

var roleAlias = make(map[string]string)
for _, r := range roles.Roles {
roleAlias[r.Name] = r.Alias
}

Check warning on line 249 in pkg/server/domain/service/user.go

View check run for this annotation

Codecov / codecov/patch

pkg/server/domain/service/user.go#L248-L249

Added lines #L248 - L249 were not covered by tests
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
}
Expand Down

0 comments on commit 5801cf3

Please sign in to comment.