Single virtual host definition export: export the entire metadata map

(cherry picked from commit dd408a4)

Author: michaelklishin

deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl

@@ -132,6 +132,11 @@ vhost_definitions(ReqData, VHostName, Context) ->
     ProductName = rabbit:product_name(),
     ProductVersion = rabbit:product_version(),
 
+    DQT = rabbit_queue_type:short_alias_of(rabbit_vhost:default_queue_type(VHostName)),
+    %% note: the type changes to a map
+    VHost1 = rabbit_queue_type:inject_dqt(VHost),
+    Metadata = maps:get(metadata, VHost1),
+
     TopLevelDefsAndMetadata = [
         {rabbit_version, rabbit_data_coercion:to_binary(Vsn)},
         {rabbitmq_version, rabbit_data_coercion:to_binary(Vsn)},
@@ -140,8 +145,9 @@ vhost_definitions(ReqData, VHostName, Context) ->
         {rabbitmq_definition_format, <<"single_virtual_host">>},
         {original_vhost_name, VHostName},
         {explanation, rabbit_data_coercion:to_binary(io_lib:format("Definitions of virtual host '~ts'", [VHostName]))},
+        {metadata, Metadata},
         {description, vhost:get_description(VHost)},
-        {default_queue_type, rabbit_queue_type:short_alias_of(rabbit_vhost:default_queue_type(VHostName))}
+        {default_queue_type, DQT}
     ],
     Result = TopLevelDefsAndMetadata ++ retain_whitelisted(Contents),
 

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -2009,6 +2009,7 @@ definitions_file_metadata_test(Config) ->
     %% verify definitions file metadata
     ?assertEqual(<<"single_virtual_host">>, maps:get(rabbitmq_definition_format, VHDefinitions)),
     ?assertEqual(VHostName, (maps:get(original_vhost_name, VHDefinitions))),
+    ?assert(is_map_key(default_queue_type, maps:get(metadata, VHDefinitions))),
 
     %% Remove the test vhost
     http_delete(Config, io_lib:format("/vhosts/~ts", [VHostName]), {group, '2xx'}),