root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5408 from rabbitmq/ik-import-vhost-default-queue-type-5399 

Import default queue type when virtual host is imported
This commit is contained in:
Michael Klishin 2022-08-01 19:30:00 +04:00 committed by GitHub
parent 0c9b41b2ef 0f541f443f
commit 589ed430e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/rabbit/src/rabbit_definitions.erl vendored
View File

@ -660,8 +660,9 @@ add_vhost(VHost, ActingUser) ->
Metadata = rabbit_data_coercion:atomize_keys(maps:get(metadata, VHost, #{})), Metadata = rabbit_data_coercion:atomize_keys(maps:get(metadata, VHost, #{})),
Description = maps:get(description, VHost, maps:get(description, Metadata, <<"">>)), Description = maps:get(description, VHost, maps:get(description, Metadata, <<"">>)),
Tags = maps:get(tags, VHost, maps:get(tags, Metadata, [])), Tags = maps:get(tags, VHost, maps:get(tags, Metadata, [])),
DefaultQueueType = maps:get(default_queue_type, Metadata, undefined),
rabbit_vhost:put_vhost(Name, Description, Tags, IsTracingEnabled, ActingUser). rabbit_vhost:put_vhost(Name, Description, Tags, DefaultQueueType, IsTracingEnabled, ActingUser).
add_permission(Permission, ActingUser) -> add_permission(Permission, ActingUser) ->
rabbit_auth_backend_internal:set_permissions(maps:get(user, Permission, undefined), rabbit_auth_backend_internal:set_permissions(maps:get(user, Permission, undefined),

1
deps/rabbit/test/definition_import_SUITE.erl vendored
View File

@ -263,6 +263,7 @@ import_case16(Config) ->
rabbit_ct_helpers:await_condition(VHostIsImported, 20000), rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
VHostRec = vhost_lookup(Config, VHost), VHostRec = vhost_lookup(Config, VHost),
?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)), ?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
?assertEqual(<<"quorum">>, vhost:get_default_queue_type(VHostRec)),
?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)), ?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
ok. ok.

1
deps/rabbit/test/definition_import_SUITE_data/case16.json vendored
View File

@ -45,6 +45,7 @@
{ {
"limits": [], "limits": [],
"metadata": { "metadata": {
"default_queue_type":"quorum",
"description": "A case16 description", "description": "A case16 description",
"tags": [ "tags": [
"multi_dc_replication", "multi_dc_replication",