Skip to content

Commit 64227ba

Browse files
Definition export: include virtual host metadata
when exporting over the HTTP API. CLI tools use rabbit_definitions:all_definitions/0 which already include the metadata. Closes #10515
1 parent c14bf13 commit 64227ba

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

deps/rabbit/src/rabbit_vhost.erl

+1
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@ i(description, VHost) -> vhost:get_description(VHost);
606606
i(tags, VHost) -> vhost:get_tags(VHost);
607607
i(default_queue_type, VHost) -> vhost:get_default_queue_type(VHost);
608608
i(metadata, VHost) -> vhost:get_metadata(VHost);
609+
i(limits, VHost) -> vhost:get_limits(VHost);
609610
i(Item, VHost) ->
610611
rabbit_log:error("Don't know how to compute a virtual host info item '~ts' for virtual host '~tp'", [Item, VHost]),
611612
throw({bad_argument, Item}).

deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export_name(_Name) -> true.
254254

255255
rw_state() ->
256256
[{users, [name, password_hash, hashing_algorithm, tags, limits]},
257-
{vhosts, [name]},
257+
{vhosts, [name, metadata, default_queue_type, limits]},
258258
{permissions, [user, vhost, configure, write, read]},
259259
{topic_permissions, [user, vhost, exchange, write, read]},
260260
{parameters, [vhost, component, name, value]},

deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,6 @@ augmented(ReqData, #context{user = User}) ->
6666
end.
6767

6868
basic() ->
69-
rabbit_vhost:info_all([name]).
69+
%% when updating this list, make sure to also update
70+
%% rabbit_mgmt_wm_definitions:rw_state/0
71+
rabbit_vhost:info_all([name, metadata, default_queue_type, limits]).

0 commit comments

Comments
 (0)