Skip to content

fix: k8s permission and chart-group permission not getting deleted from orchestrator #3824

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 28, 2023
Merged

fix: k8s permission and chart-group permission not getting deleted from orchestrator #3824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd12624
duplication fix in k8s and chart-group
Shivam-nagar23 Aug 24, 2023
54a5c3b
Merge branch 'main' into rbac-policies-duplication-fix
Shivam-nagar23 Aug 24, 2023
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
13 changes: 3 additions & 10 deletions pkg/user/UserCommonService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,21 +258,13 @@ func (impl UserCommonServiceImpl) RemoveRolesAndReturnEliminatedPolicies(userInf
impl.logger.Errorw("Error in fetching roles by filter", "roleFilter", roleFilter)
return nil, err
}
oldRoleModel, err := impl.userAuthRepository.GetRoleByFilterForAllTypes(roleFilter.Entity, "", "", "", "", accessType, roleFilter.Cluster, namespace, group, kind, resource, actionType, true)
if err != nil {
return 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 := existingRoleIds[roleModel.Id]; ok {
delete(eliminatedRoleIds, roleModel.Id)
}
if _, ok := existingRoleIds[oldRoleModel.Id]; ok {
//delete old role mapping from existing but not from eliminated roles (so that it gets deleted)
delete(existingRoleIds, oldRoleModel.Id)
}
}
}
}
Expand Down Expand Up @@ -321,7 +313,8 @@ func (impl UserCommonServiceImpl) RemoveRolesAndReturnEliminatedPolicies(userInf
if _, ok := existingRoleIds[roleModel.Id]; ok {
delete(eliminatedRoleIds, roleModel.Id)
}
if _, ok := existingRoleIds[oldRoleModel.Id]; ok {
isChartGroupEntity := roleFilter.Entity == bean.CHART_GROUP_ENTITY
if _, ok := existingRoleIds[oldRoleModel.Id]; ok && !isChartGroupEntity {
//delete old role mapping from existing but not from eliminated roles (so that it gets deleted)
delete(existingRoleIds, oldRoleModel.Id)
}
Expand Down