HTTP API: make sure virtual host limit values are returned as a JSON object

.github/workflows/rabbitmq_peer_discovery_aws.yaml

@@ -66,7 +66,7 @@ jobs:
         ecs-cli --version
     - name: AUTHENTICATE TO GOOGLE CLOUD
       if: steps.authorized.outputs.authorized == 'true'
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: CONFIGURE BAZEL

.github/workflows/templates/test-mixed-versions.template.yaml

@@ -96,7 +96,7 @@ jobs:
           https://builds.hex.pm
           https://cdn.jsdelivr.net/hex
     - name: AUTHENTICATE TO GOOGLE CLOUD
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: BUILD SECONDARY UMBRELLA ARCHIVE

.github/workflows/templates/test.template.yaml

@@ -72,7 +72,7 @@ jobs:
       run: |
         echo "value=bazel-repo-cache-${{ hashFiles('MODULE.bazel') }}" | tee -a $GITHUB_OUTPUT
     - name: AUTHENTICATE TO GOOGLE CLOUD
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: REPO CACHE

.github/workflows/test-authnz.yaml

@@ -58,7 +58,7 @@ jobs:
           https://cdn.jsdelivr.net/hex
 
     - name: Authenticate To Google Cloud
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
 

.github/workflows/test-mixed-versions.yaml

@@ -74,7 +74,7 @@ jobs:
           https://builds.hex.pm
           https://cdn.jsdelivr.net/hex
     - name: AUTHENTICATE TO GOOGLE CLOUD
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: BUILD SECONDARY UMBRELLA ARCHIVE

.github/workflows/test-plugin-mixed.yaml

@@ -54,7 +54,7 @@ jobs:
           https://builds.hex.pm
           https://cdn.jsdelivr.net/hex
     - name: AUTHENTICATE TO GOOGLE CLOUD
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: CONFIGURE BAZEL

.github/workflows/test-plugin.yaml

@@ -51,7 +51,7 @@ jobs:
           https://builds.hex.pm
           https://cdn.jsdelivr.net/hex
     - name: AUTHENTICATE TO GOOGLE CLOUD
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: CONFIGURE BAZEL

.github/workflows/test-selenium.yaml

@@ -20,7 +20,7 @@ on:
   pull_request:
     paths:
       - 'deps/rabbitmq_management/**'
-      - .github/workflows/test-selenium-for-pull-requests.yaml      
+      - .github/workflows/test-selenium-for-pull-requests.yaml
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -54,7 +54,7 @@ jobs:
           https://cdn.jsdelivr.net/hex
 
     - name: Authenticate To Google Cloud
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
 

.github/workflows/test.yaml

@@ -52,7 +52,7 @@ jobs:
       run: |
         echo "value=bazel-repo-cache-${{ hashFiles('MODULE.bazel') }}" | tee -a $GITHUB_OUTPUT
     - name: AUTHENTICATE TO GOOGLE CLOUD
-      uses: google-github-actions/[email protected].4
+      uses: google-github-actions/[email protected].5
       with:
         credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
     - name: REPO CACHE

deps/rabbitmq_management/src/rabbit_mgmt_wm_limits.erl

@@ -45,13 +45,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

@@ -3411,13 +3411,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),