software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change deleteRole to deleteRoleKeys

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-20 11:53:35 -05:00
parent 90662720fd
commit a5d7c083ed
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/internal/controller/project_controller.go
View File

@@ -186,7 +186,7 @@ func (wr *wrappedProjectReconciler) reconcileRoles(ctx context.Context, ztdClien
return fmt.Errorf("Could not list project roles: %v", err)
}
roles := map[string]*pb.BulkAddProjectRolesRequest_Role{}
deleteRoles := []*pb.BulkAddProjectRolesRequest_Role{}
deleteRolesKeys := []string{}
for _, role := range wr.project.Spec.Roles {
roles[role.Key] = &pb.BulkAddProjectRolesRequest_Role{
Key: role.Key,
@@ -198,20 +198,20 @@ func (wr *wrappedProjectReconciler) reconcileRoles(ctx context.Context, ztdClien
for _, role := range resp.Result {
if r, ok := roles[role.Key]; ok {
if r.DisplayName != role.DisplayName || r.Group != role.Group {
deleteRoles = append(deleteRoles, r)
deleteRolesKeys = append(deleteRolesKeys, role.Key)
} else {
delete(roles, role.Key)
}
} else {
deleteRoles = append(deleteRoles, r)
deleteRolesKeys = append(deleteRolesKeys, role.Key)
}
}
if len(deleteRoles) > 0 {
for _, dRole := range deleteRoles {
if len(deleteRolesKeys) > 0 {
for _, key := range deleteRolesKeys {
if _, err = ztdClient.RemoveProjectRole(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.RemoveProjectRoleRequest{
ProjectId: wr.project.Status.ProjectId,
RoleKey: dRole.Key,
RoleKey: key,
}); err != nil {
return fmt.Errorf("Error removing project role: %v", err)
}