Rename a schema key

References #6172

3 files changed, 13 insertions, 13 deletions

diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
index 97761df37a..7dc5e6008d 100644
--- a/deps/rabbit/priv/schema/rabbit.schema
+++ b/deps/rabbit/priv/schema/rabbit.schema
@@ -632,7 +632,7 @@ end}.
 %% {default_user,        <<"guest">>},
 %% {default_pass,        <<"guest">>},
 %% {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
-%% {default_limits,      [{vhost, []}]
+%% {default_limits,      [{vhosts, []}]
 
 {mapping, "default_vhost", "rabbit.default_vhost", [
     {datatype, string}
@@ -682,30 +682,30 @@ fun(Conf) ->
     [list_to_binary(Configure), list_to_binary(Read), list_to_binary(Write)]
 end}.
 
-{mapping, "default_limits.vhost.$id.pattern", "rabbit.default_limits.vhost", [
+{mapping, "default_limits.vhosts.$id.pattern", "rabbit.default_limits.vhosts", [
     {include_default, 1},
     {comment, ".*"},
     {validators, ["valid_regex"]},
     {datatype, string}
 ]}.
 
-{mapping, "default_limits.vhost.$id.max_connections", "rabbit.default_limits.vhost", [
+{mapping, "default_limits.vhosts.$id.max_connections", "rabbit.default_limits.vhosts", [
     {include_default, 1},
     {comment, 1000},
     {validators, [ "non_zero_positive_integer"]},
     {datatype, integer}
 ]}.
 
-{mapping, "default_limits.vhost.$id.max_queues", "rabbit.default_limits.vhost", [
+{mapping, "default_limits.vhosts.$id.max_queues", "rabbit.default_limits.vhosts", [
     {include_default, 1},
     {comment, 100},
     {validators, [ "non_zero_positive_integer"]},
     {datatype, integer}
 ]}.
 
-{translation, "rabbit.default_limits.vhost",
+{translation, "rabbit.default_limits.vhosts",
 fun(Conf) ->
-    Prefix = ["default_limits", "vhost"],
+    Prefix = ["default_limits", "vhosts"],
     GetAll = fun(Spec) ->
                      FullSpec = Prefix ++ Spec,
                      lists:filtermap(
@@ -727,7 +727,7 @@ fun(Conf) ->
                   ),
     [ cuttlefish:invalid(
         io_lib:format(
-           "default_limits.vhost.~ts.pattern required",
+           "default_limits.vhosts.~ts.pattern required",
            [ID]))
      || ID <- SettingIDs, Get([ID, "pattern"]) =:= undefined ],
 
diff --git a/deps/rabbit/src/rabbit_vhost.erl b/deps/rabbit/src/rabbit_vhost.erl
index ec5831ae5e..f0f1541349 100644
--- a/deps/rabbit/src/rabbit_vhost.erl
+++ b/deps/rabbit/src/rabbit_vhost.erl
@@ -143,7 +143,7 @@ parse_tags(Val) when is_list(Val) ->
 -spec default_limits(vhost:name()) -> proplists:proplist().
 default_limits(Name) ->
     AllLimits = application:get_env(rabbit, default_limits, []),
-    VHostLimits = proplists:get_value(vhost, AllLimits, []),
+    VHostLimits = proplists:get_value(vhosts, AllLimits, []),
     Match = lists:search(fun({RE, _}) ->
                                  re:run(Name, RE, [{capture, none}]) =:= match
                          end, VHostLimits),
diff --git a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
index fa2acb0282..14a447f89d 100644
--- a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
+++ b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
@@ -102,9 +102,9 @@ ssl_options.fail_if_no_peer_cert = true",
 
  {default_limits_vhost,
  "
-  default_limits.vhost.a.pattern = .*
-  default_limits.vhost.a.max_queues = 10
-  default_limits.vhost.a.max_connections = 100
+  default_limits.vhosts.a.pattern = .*
+  default_limits.vhosts.a.max_queues = 10
+  default_limits.vhosts.a.max_connections = 100
  ",
   [{rabbit, [{default_limits, [{vhost, [
       {<<".*">>, [{<<"max-connections">>, 100}, {<<"max-queues">>, 10}]}
@@ -113,8 +113,8 @@ ssl_options.fail_if_no_peer_cert = true",
 
  {default_limits_vhost_no_undefined,
  "
-  default_limits.vhost.a.pattern = .*
-  default_limits.vhost.a.max_queues = 10
+  default_limits.vhosts.a.pattern = .*
+  default_limits.vhosts.a.max_queues = 10
  ",
   [{rabbit, [{default_limits, [{vhost, [
       {<<".*">>, [{<<"max-queues">>, 10}]}