Bootstrap token #717
Merged
Bootstrap token #717
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
jswoods
force-pushed
the
jestin/bootstrap-token
branch
2 times, most recently
from
ed0a6a1 to
aa5b87c
Compare
jswoods
force-pushed
the
jestin/bootstrap-token
branch
from
cb5419d to
66aace4
Compare
jswoods
force-pushed
the
jestin/bootstrap-token
branch
from
ea1b8a2 to
dbe782a
Compare
jswoods
force-pushed
the
jestin/bootstrap-token
branch
from
dbe782a to
3da9a49
Compare
Comment on lines
+32
to
+39
| for _, userResult := range allUserResults { | ||
| if userResult.OrganizationName == "RecoveryRootOrg" { | ||
| if userResult.SearchMatch == fmt.Sprintf(" | %s () ()", username) { | ||
| fmt.Printf("Found user ID using multi-organization query.\n") | ||
| return userResult.EntityId, nil | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Some day we should probably refactor this, so that we fetch subscription as part of userResult and so we can match on userResult.Subscription = "ClusterOwner" instead of whatever the name of the cluster owner organization happens to be. I see this is just moving over whatever "user & token management" from the auth sidecar into the Reconciler, so its fine to stick with this right now, but ideally we'd tidy this up a bit.
There was a problem hiding this comment.
If single org. mode is active it seems like organization ID is SINGLE_ORGANIZATION_ID with subscription being Paying.
So probably want to:
if single org mode:
find user in the organization with `orgID=SINGLE_ORGANIZATION_ID`
if multi org mode:
find user in the organization with `subscription=ClusterOwner`
(or maybe split in two, first look up orgID of org that is cluster owner, then specifically search that organization for the user)
SaaldjorMike
approved these changes
Jun 27, 2024
jswoods
force-pushed
the
jestin/bootstrap-token
branch
from
5193f30 to
8e010b9
Compare
jswoods
force-pushed
the
jestin/bootstrap-token
branch
2 times, most recently
from
56bf7d1 to
9aaceac
Compare
jswoods
force-pushed
the
jestin/bootstrap-token
branch
from
9aaceac to
4916d34
Compare
SaaldjorMike
approved these changes
Sep 9, 2024
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.
No description provided.