Skip to content

Conversation

bahaa-ghazal
Copy link
Contributor

Ticket: MEN-8649

Tried to not remove too much to not make OS even more different from enterprise.

Ticket: MEN-8649
Signed-off-by: Bahaa Aldeen Ghazal <[email protected]>
Ticket: MEN-8649
Signed-off-by: Bahaa Aldeen Ghazal <[email protected]>
@alfrunes alfrunes changed the base branch from main to MEN-8649 September 4, 2025 14:16
Copy link
Contributor

@alfrunes alfrunes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants