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

Null check deleteRoles

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-20 11:17:31 -05:00
parent 0026f20c04
commit 33071d2b8b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,6 +207,7 @@ func (wr *wrappedProjectReconciler) reconcileRoles(ctx context.Context, ztdClien
} }
} }
if deleteRoles != nil {
for _, dRole := range deleteRoles { for _, dRole := range deleteRoles {
if _, err = ztdClient.RemoveProjectRole(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.RemoveProjectRoleRequest{ if _, err = ztdClient.RemoveProjectRole(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.RemoveProjectRoleRequest{
ProjectId: wr.project.Status.ProjectId, ProjectId: wr.project.Status.ProjectId,
@@ -215,6 +216,8 @@ func (wr *wrappedProjectReconciler) reconcileRoles(ctx context.Context, ztdClien
return fmt.Errorf("Error removing project role: %v", err) return fmt.Errorf("Error removing project role: %v", err)
} }
} }
}
if len(roles) > 0 { if len(roles) > 0 {
_, err = ztdClient.BulkAddProjectRoles(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.BulkAddProjectRolesRequest{ _, err = ztdClient.BulkAddProjectRoles(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.BulkAddProjectRolesRequest{
ProjectId: wr.project.Status.ProjectId, ProjectId: wr.project.Status.ProjectId,