Fix project creation conflict during user creation #3815
Merged
Conversation
This file contains 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
jhrozek
previously approved these changes
Jul 10, 2024
| @@ -78,7 +80,13 @@ func (s *Server) CreateUser(ctx context.Context, | |||
| // Set up the default project for the user | |||
| baseName := subject | |||
| if token.PreferredUsername() != "" { | |||
| baseName = token.PreferredUsername() | |||
| // Check if `project_name_lower_idx` unique constraint was violated. This happens when | |||
There was a problem hiding this comment.
Is this an outdated comment? We check the other way around, to see if there's sql.ErrNoRows returned right?
There was a problem hiding this comment.
You're right, this was a leftover copy-pasta from the other place where we had this check 👍
| // getUniqueProjectBaseName is used to generate a unique project name | ||
| func getUniqueProjectBaseName(ctx context.Context, store db.Store, baseName string) (string, error) { | ||
| uniqueBaseName := baseName | ||
| for { |
There was a problem hiding this comment.
I know it's unlikely we hit a really infinite loop here, but for {} always makes me nervous. Do you think we could add some upper limit?
There was a problem hiding this comment.
I'll add a 10 times retry mechanism. It should be more than enough 👍
rdimitrov
force-pushed
the
fix-project-conflict
branch
from
e3d20c0
to
0caa6ba
Compare
Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
rdimitrov
force-pushed
the
fix-project-conflict
branch
from
0caa6ba
to
404d81a
Compare
jhrozek
approved these changes
Jul 10, 2024
dmjb
pushed a commit
that referenced
this pull request
Jul 12, 2024
* Fix project creation conflict during user creation Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com> * Add for loop retry counter and update comment Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com> --------- Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
The following PR fixes the conflict that may happen if the project we try to create during
CreateUseralready exists.The proposed solution checks if there's such project with that name, if there's appends a random 4 char string and tries again until it finds a unique combination.
Change Type
Mark the type of change your PR introduces:
Testing
Outline how the changes were tested, including steps to reproduce and any relevant configurations.
Attach screenshots if helpful.
Review Checklist: