Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call"

This reverts commit 78f901a. (cherry picked from commit 7ebaae7) # Conflicts: #	deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl (cherry picked from commit 7042bc4) # Conflicts: #	deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl

Author: michaelklishin

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl

@@ -71,12 +71,17 @@ 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),
+<<<<<<< HEAD
  VHost = rabbit_mgmt_util:id(vhost, ReqData),
+=======
+<<<<<<< HEAD
+ VHost = rabbit_mgmt_util:id(vhost, ReqData),
+>>>>>>> 7042bc4864 (Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call")
  QName = rabbit_mgmt_util:id(queue, ReqData),
  Name = rabbit_misc:r(VHost, queue, QName),
  case rabbit_amqqueue:lookup(Name) of
@@ -96,6 +101,15 @@ delete_resource(ReqData, Context = #context{user = #user{username = ActingUser}}
  {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).
+>>>>>>> 7ebaae7ef0 (Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call")
 
 is_authorized(ReqData, Context) ->
  rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -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'}),