From a5d7c083ed3e1c15bc8088f22e318faf05dfd386 Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Mon, 20 May 2024 11:53:35 -0500 Subject: [PATCH] Change deleteRole to deleteRoleKeys [ZITADOPER-1] --- src/internal/controller/project_controller.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/internal/controller/project_controller.go b/src/internal/controller/project_controller.go index 368bb77..2297a64 100644 --- a/src/internal/controller/project_controller.go +++ b/src/internal/controller/project_controller.go @@ -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) }