Skip to content
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
11 changes: 1 addition & 10 deletions pkg/auth/user/UserCommonService.go
Original file line number Diff line number Diff line change
Expand Up @@ -412,22 +412,13 @@ func (impl UserCommonServiceImpl) RemoveRolesAndReturnEliminatedPoliciesForGroup
impl.logger.Errorw("Error in fetching roles by filter", "user", request)
return nil, nil, err
}
oldRoleModel, err := impl.userAuthRepository.GetRoleByFilterForAllTypes(entity, "", "", "", "", accessType, roleFilter.Cluster, namespace, group, kind, resource, actionType, true, "")
if err != nil {
impl.logger.Errorw("Error in fetching roles by filter", "user", request)
return nil, nil, err
}
if roleModel.Id == 0 && oldRoleModel.Id == 0 {
if roleModel.Id == 0 {
impl.logger.Warnw("no role found for given filter", "filter", roleFilter)
continue
}
if _, ok := existingRoles[roleModel.Id]; ok {
delete(eliminatedRoles, roleModel.Id)
}
if _, ok := existingRoles[oldRoleModel.Id]; ok {
//delete old role mapping from existing but not from eliminated roles (so that it gets deleted)
delete(existingRoles, oldRoleModel.Id)
}
}
}
}
Expand Down
Loading