MEN-8649: Clean OS services from tenantadm related code 🧹 #904
Conversation
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
bahaa-ghazal
force-pushed
the
MEN-8649
branch
from
87094c2 to
cf7fe3c
Compare
Ticket: MEN-8649 Signed-off-by: Bahaa Aldeen Ghazal <[email protected]>
Ticket: MEN-8649 Signed-off-by: Bahaa Aldeen Ghazal <[email protected]>
bahaa-ghazal
force-pushed
the
MEN-8649
branch
from
cf7fe3c to
0574a79
Compare
alfrunes
approved these changes
Sep 4, 2025
Contributor
alfrunes
left a comment
alfrunes
left a comment
There was a problem hiding this comment.
The changes looks good to me, great job!
I created a new upstream branch as we also need to merge these changes to enterprise before committing it to main.
Comment on lines
172
to
180
| func (rl *RedisCache) Throttle( | ||
| ctx context.Context, | ||
| rawToken string, | ||
| l ratelimits.ApiLimits, | ||
| tid, | ||
| id, | ||
| idtype, | ||
| url, | ||
| action string, | ||
| ) (string, error) { |
Contributor
There was a problem hiding this comment.
Throttle but without the "Throttling" part 🙃
| // in that case we need to wipe identity data from the context | ||
| ctx = identity.WithContext(ctx, nil) | ||
| } | ||
| ctx = identity.WithContext(ctx, nil) |
Contributor
There was a problem hiding this comment.
This hack should be unnecessary after the migration go gin-gonic, right?
That is, if there's no identity middleware for this API.
Comment on lines
-422
to
-428
| err := ua.cTenant.UpdateUser(ctx, | ||
| idty.Tenant, | ||
| id, | ||
| &tenant.UserUpdate{ | ||
| Name: string(userUpdate.Email), | ||
| }, | ||
| ua.clientGetter()) |
Contributor
There was a problem hiding this comment.
Wow, this seems like a leftover. This should never happen under any circumstances since we removed duplicating users from tenantadm service. 📝
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.
Ticket: MEN-8649
Tried to not remove too much to not make OS even more different from enterprise.