fix(gitlab): return existing user on 409 instead of failing sync - #2535
Merged
Conversation
shikanime
force-pushed
the
fix/gitlab-user-collision
branch
from
August 20, 2026 16:17
d90d2cb to
090e733
Compare
shikanime
marked this pull request as draft
August 20, 2026 16:32
shikanime
force-pushed
the
fix/gitlab-user-collision
branch
2 times, most recently
from
August 20, 2026 16:58
4d775e9 to
ac8c263
Compare
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I9ef9b105f0f5debdbbbb78fffe2b35846a6a6964
shikanime
force-pushed
the
fix/gitlab-user-collision
branch
from
August 20, 2026 16:59
ac8c263 to
e682458
Compare
shikanime
marked this pull request as ready for review
August 20, 2026 17:00
|
0 New Issues
0 Fixed Issues
0 Accepted Issues
KepoParis
approved these changes
Aug 21, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Aug 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issues liées
Closes #2529
Quel est le comportement actuel ?
Lors de la réconciliation GitLab (
upsertUser→createUser), un 409Username has already been takeninterrompt la synchronisation du projet :createUserlève une exception et aucun membre n'est ajouté pour ce projet.Quel est le nouveau comportement ?
createUsercapture leGitbeakerRequestErrordontcause.descriptioncontienthas already been taken, puis renvoie l'utilisateur déjà existant (résolu pargetUserByEmail) au lieu de propager l'erreur. La réconciliation se termine normalement.Cette PR introduit-elle un breaking change ?
Non.
Autres informations
GitLab auto-provisionne les utilisateurs via OIDC : un 409 sur
createUsersignifie que l'utilisateur existe déjà (course sur l'index e-mail dansgetUserByEmail). Indépendant de #2524 / #2526 (erreur 500//api/v4due au slash final deGITLAB_URL).