rabbitmq-auth-backend-oauth2: correctly map additional_scopes_key

Hathoute commented 3 days ago

Proposed Changes

Fix #12750 by introducing a synonyms map that will map additional_scopes_key to extra_scopes_source, instead of replacing extra_scopes_source in the schema which will be a breaking change.

There's probably a better way to handle this, as this is my first time writing erlang code, let me know what you think.

Types of Changes

[x] Bug fix (non-breaking change which fixes issue #12750 )

Checklist

[x] I have read the CONTRIBUTING.md document
[x] I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
[x] I have added tests that prove my fix is effective or that my feature works
[ ] All tests pass locally with my changes (tested only rabbitmq-auth-backend-oauth2)

michaelklishin commented 3 days ago

https://github.com/rabbitmq/rabbitmq-server/pull/12752

michaelklishin commented 3 days ago

So yeah, the key under resource_servers is different in the generated snippet vs. the expected one.

Hathoute commented 3 days ago

Should be good now, took some time to have a working environment on my Windows laptop.

michaelklishin commented 3 days ago

@Hathoute thank you for the quick turnaround, I have cherry-picked https://github.com/rabbitmq/rabbitmq-server/pull/12751/commits/6459111f86fedfe16557d45dc04a006c8611d4a9 to #12752 and will deal with any flakes that may pop up.

michaelklishin commented 2 days ago

@Hathoute in case you'd like to test this change in a build, use RabbitMQ 4.1.0-alpha.0081e1d0.

A 4.0.4 equivalent is 4.0.4-alpha.63e327fc.

rabbitmq / rabbitmq-server