Fixes #24318: Existing deleted user managed by file cannot be reactivated #5435
Conversation
clarktsiory
changed the base branch from
branches/rudder/7.3
to
backports/7.3.12/24146
| case k if zombies.get(k).map(u => u.status == UserStatus.Deleted && u.managedBy == origin).getOrElse(false) => | ||
| ( | ||
| k, | ||
| zombies(k) | ||
| .modify(_.status) | ||
| .setTo(UserStatus.Active) | ||
| .modify(_.statusHistory) | ||
| .using(StatusHistory(UserStatus.Active, trace) :: _) | ||
| ) |
There was a problem hiding this comment.
I don't know if there is a more elegant way, instead of having zombies.get(k) then zombies(k) later...
There was a problem hiding this comment.
Put the condition below and pattern match on get(K) in place of having a guard. Iirc it's similar in perf and alloc
There was a problem hiding this comment.
But the case k if ... => is passed to a collect and should not be a function but a partial function.
There is always the option to change to a function and flatMap on Option but I don't know if that way it is worth the change...
There was a problem hiding this comment.
I just realized that maybe you were exactly referring to that 😅 : bf74ff1
|
PR updated with a new commit |
1 similar comment
|
PR updated with a new commit |
|
I will need to be rebased after retarget to branche 7.3 |
clarktsiory
force-pushed
the
bug_24318/existing_deleted_user_managed_by_file_cannot_be_reactivated
branch
from
4be737d
to
dec8ae9
Compare
|
PR rebased and updated with a new commit |
|
This PR is not mergeable to upper versions. |
|
OK, squash merging this PR |
clarktsiory
force-pushed
the
bug_24318/existing_deleted_user_managed_by_file_cannot_be_reactivated
branch
from
bf74ff1
to
6ff585c
Compare
clarktsiory
merged commit 6ff585c
into
Normation:branches/rudder/7.3
https://issues.rudder.io/issues/24318
Another condition is added to the
computeUpdatedUserList: deleted users that are in active users list should be active again if they are from the same origin.The
computeUpdatedUserListis being more patched over time, so I added unit tests to it, in addition to fixing the initial problem.