From 33071d2b8b758ecde2252f75cbcaa286a01a50af Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Mon, 20 May 2024 11:17:31 -0500 Subject: [PATCH] Null check deleteRoles [ZITADOPER-1] --- src/internal/controller/project_controller.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/internal/controller/project_controller.go b/src/internal/controller/project_controller.go index c450ee7..807a479 100644 --- a/src/internal/controller/project_controller.go +++ b/src/internal/controller/project_controller.go @@ -207,14 +207,17 @@ func (wr *wrappedProjectReconciler) reconcileRoles(ctx context.Context, ztdClien } } - for _, dRole := range deleteRoles { - if _, err = ztdClient.RemoveProjectRole(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.RemoveProjectRoleRequest{ - ProjectId: wr.project.Status.ProjectId, - RoleKey: dRole.Key, - }); err != nil { - return fmt.Errorf("Error removing project role: %v", err) + if deleteRoles != nil { + for _, dRole := range deleteRoles { + if _, err = ztdClient.RemoveProjectRole(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.RemoveProjectRoleRequest{ + ProjectId: wr.project.Status.ProjectId, + RoleKey: dRole.Key, + }); err != nil { + return fmt.Errorf("Error removing project role: %v", err) + } } } + if len(roles) > 0 { _, err = ztdClient.BulkAddProjectRoles(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.BulkAddProjectRolesRequest{ ProjectId: wr.project.Status.ProjectId,