Merge pull request #12084 from rabbitmq/mergify/bp/v3.13.x/pr-12083

HTTP API: make sure virtual host limit values are returned as a JSON object (backport #12081) (backport #12083)

Author: michaelklishin

deps/rabbitmq_management/src/rabbit_mgmt_wm_limits.erl

@@ -47,13 +47,21 @@ limits(ReqData, Context) ->
         none ->
             User = Context#context.user,
             VisibleVhosts = rabbit_mgmt_util:list_visible_vhosts_names(User),
-            [ [{vhost, VHost}, {value, Value}]
-              || {VHost, Value} <- rabbit_vhost_limit:list(),
-                 lists:member(VHost, VisibleVhosts) ];
+            [
+                #{
+                    vhost => VHost,
+                    value => rabbit_data_coercion:to_map(Value)
+                } || {VHost, Value} <- rabbit_vhost_limit:list(), lists:member(VHost, VisibleVhosts)
+            ];
         VHost when is_binary(VHost) ->
             case rabbit_vhost_limit:list(VHost) of
                 []    -> [];
-                Value -> [[{vhost, VHost}, {value, Value}]]
+                Value -> [
+                    #{
+                        vhost => VHost,
+                        value => rabbit_data_coercion:to_map(Value)
+                    }
+                ]
             end
     end.
 %%--------------------------------------------------------------------

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -3265,13 +3265,14 @@ vhost_limits_list_test(Config) ->
     lists:map(
         fun(#{vhost := VHost, value := Val}) ->
             Param = [ {atom_to_binary(K, utf8),V} || {K,V} <- maps:to_list(Val) ],
+            ct:pal("Setting limits of virtual host '~ts' to ~tp", [VHost, Param]),
             ok = rabbit_ct_broker_helpers:set_parameter(Config, 0, VHost, <<"vhost-limits">>, <<"limits">>, Param)
         end,
         Expected),
 
-    Expected = http_get(Config, "/vhost-limits", ?OK),
-    Limits1 = http_get(Config, "/vhost-limits/limit_test_vhost_1", ?OK),
-    Limits2 = http_get(Config, "/vhost-limits/limit_test_vhost_2", ?OK),
+    ?assertEqual(lists:usort(Expected), lists:usort(http_get(Config, "/vhost-limits", ?OK))),
+    ?assertEqual(Limits1, http_get(Config, "/vhost-limits/limit_test_vhost_1", ?OK)),
+    ?assertEqual(Limits2, http_get(Config, "/vhost-limits/limit_test_vhost_2", ?OK)),
 
     NoVhostUser = <<"no_vhost_user">>,
     rabbit_ct_broker_helpers:add_user(Config, NoVhostUser),