Skip to content

Commit fa62b23

Browse files
Preserve config order
1 parent d0db108 commit fa62b23

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

deps/rabbitmq_management/src/rabbit_mgmt_schema.erl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
-module(rabbit_mgmt_schema).
99

10+
-include_lib("kernel/include/logger.hrl").
1011

1112
-export([
1213
translate_oauth_resource_servers/1,
@@ -54,6 +55,7 @@ extract_resource_server_properties(Settings) ->
5455

5556
OAuthResourceServers = [{Name, {list_to_atom(Key), convert_list_to_binary(V)}}
5657
|| {["management","oauth_resource_servers", Name, Key], V} <- Settings ],
58+
?LOG_DEBUG("OAuthResourceServers: ~p", [OAuthResourceServers]),
5759
maps:groups_from_list(KeyFun, ValueFun, OAuthResourceServers).
5860

5961

deps/rabbitmq_management/test/rabbit_mgmt_schema_SUITE.erl

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ all() ->
1919
test_invalid_endpoint_params,
2020
test_translate_endpoint_params,
2121
test_with_one_resource_server,
22-
test_with_many_resource_servers
22+
test_with_many_resource_servers,
23+
test_preserve_order_when_using_many_resource_servers
2324
].
2425

2526

@@ -67,6 +68,26 @@ test_with_many_resource_servers(_) ->
6768
]
6869
} = translate_oauth_resource_servers(Conf).
6970

71+
test_preserve_order_when_using_many_resource_servers(_) ->
72+
Conf = [
73+
{["management","oauth_resource_servers","uaa","label"],"Uaa"},
74+
{["management","oauth_resource_servers","spring","label"],"Spring"},
75+
{["management","oauth_resource_servers","keycloak","label"],"Keycloak"}
76+
],
77+
#{
78+
<<"uaa">> := [
79+
{label, <<"Uaa">>},
80+
{id, <<"uaa">>}
81+
],
82+
<<"spring">> := [
83+
{label, <<"Spring">>},
84+
{id, <<"spring">>}
85+
],
86+
<<"keycloak">> := [
87+
{label, <<"Keycloak">>},
88+
{id, <<"keycloak">>}
89+
]
90+
} = translate_oauth_resource_servers(Conf).
7091

7192
cert_filename(Conf) ->
7293
string:concat(?config(data_dir, Conf), "certs/cert.pem").

0 commit comments

Comments
 (0)