From fddb2e7734bd3a150ce01788d644ca14d22a7dbc Mon Sep 17 00:00:00 2001 From: Diana Parra Corbacho Date: Tue, 21 Oct 2025 11:12:42 +0200 Subject: [PATCH 1/2] rabbit_vhost: Set default description and tags in vhost metadata --- deps/rabbit/src/rabbit_vhost.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit/src/rabbit_vhost.erl b/deps/rabbit/src/rabbit_vhost.erl index 7b08e3fec706..f6321e881dcb 100644 --- a/deps/rabbit/src/rabbit_vhost.erl +++ b/deps/rabbit/src/rabbit_vhost.erl @@ -173,7 +173,7 @@ parse_tags(Val) when is_list(Val) -> -spec add(vhost:name(), rabbit_types:username()) -> rabbit_types:ok_or_error(any()). add(VHost, ActingUser) -> - add(VHost, #{}, ActingUser). + add(VHost, <<>>, [], ActingUser). -spec add(vhost:name(), binary(), [atom()], rabbit_types:username()) -> rabbit_types:ok_or_error(any()). From 396800ee0a3b8a923e9637192e86dbde83707ef0 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 31 Oct 2025 11:00:10 -0700 Subject: [PATCH 2/2] Update a test expectation #14765 (cherry picked from commit 2f6602b26d6b187e82149ac7041747ee97d7eebe) --- .../test/rabbit_mgmt_http_vhost_deletion_protection_SUITE.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_http_vhost_deletion_protection_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_http_vhost_deletion_protection_SUITE.erl index 0aa04bddb188..1b971b2aea32 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_http_vhost_deletion_protection_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_http_vhost_deletion_protection_SUITE.erl @@ -160,6 +160,8 @@ protected_virtual_host_is_marked_as_such_in_definition_export(Config) -> Metadata = maps:get(metadata, VHost), ?assertEqual(Name, maps:get(name, VHost)), ?assertEqual(Metadata, #{ + description => <<>>, + tags => [], protected_from_deletion => true, default_queue_type => <<"classic">> }),