Skip to content

Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call (backport #10185) #10187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call (backport #10185) #10187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7042bc4
Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API …
michaelklishin Dec 20, 2023
685c4f6
Resolve a conflict #10185 #10187
michaelklishin Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,18 @@ accept_content(ReqData, Context) ->
rabbit_mgmt_util:bad_request(iolist_to_binary(io_lib:format(F ++ "~n", A)), ReqData, Context)
end.

delete_resource(ReqData, Context = #context{user = #user{username = ActingUser}}) ->
delete_resource(ReqData, Context) ->
%% We need to retrieve manually if-unused and if-empty, as the HTTP API uses '-'
%% while the record uses '_'
IfUnused = <<"true">> =:= rabbit_mgmt_util:qs_val(<<"if-unused">>, ReqData),
IfEmpty = <<"true">> =:= rabbit_mgmt_util:qs_val(<<"if-empty">>, ReqData),
VHost = rabbit_mgmt_util:id(vhost, ReqData),
QName = rabbit_mgmt_util:id(queue, ReqData),
Name = rabbit_misc:r(VHost, queue, QName),
case rabbit_amqqueue:lookup(Name) of
{ok, Q} ->
case rabbit_amqqueue:delete(Q, IfUnused, IfEmpty, ActingUser) of
{ok, _} ->
{true, ReqData, Context};
{error, not_empty} ->
Explanation = io_lib:format("~ts not empty", [rabbit_misc:rs(Name)]),
rabbit_log:warning("Delete queue error: ~ts", [Explanation]),
rabbit_mgmt_util:bad_request(list_to_binary(Explanation), ReqData, Context);
{error, in_use} ->
Explanation = io_lib:format("~ts in use", [rabbit_misc:rs(Name)]),
rabbit_log:warning("Delete queue error: ~ts", [Explanation]),
rabbit_mgmt_util:bad_request(list_to_binary(Explanation), ReqData, Context)
end;
{error, not_found} ->
{true, ReqData, Context}
end.
Name = rabbit_mgmt_util:id(queue, ReqData),
rabbit_mgmt_util:direct_request(
'queue.delete',
fun rabbit_mgmt_format:format_accept_content/1,
[{queue, Name},
{if_unused, IfUnused},
{if_empty, IfEmpty}], "Delete queue error: ~ts", ReqData, Context).

is_authorized(ReqData, Context) ->
rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
Expand Down
4 changes: 3 additions & 1 deletion deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,9 @@ queue_purge_test(Config) ->
http_delete(Config, "/queues/%2F/myqueue/contents", {group, '2xx'}),
http_delete(Config, "/queues/%2F/badqueue/contents", ?NOT_FOUND),
http_delete(Config, "/queues/%2F/exclusive/contents", ?BAD_REQUEST),
http_delete(Config, "/queues/%2F/exclusive", {group, '2xx'}),
http_delete(Config, "/queues/%2F/exclusive", ?BAD_REQUEST),
#'basic.get_empty'{} =
amqp_channel:call(Ch, #'basic.get'{queue = <<"myqueue">>}),
close_channel(Ch),
close_connection(Conn),
http_delete(Config, "/queues/%2F/myqueue", {group, '2xx'}),
Expand Down