Move duplicate code to rabbit_mgmt_util

Author: lukebakken

deps/rabbitmq_management/src/rabbit_mgmt_util.erl

@@ -51,6 +51,8 @@
 
 -export([disable_stats/1, enable_queue_totals/1]).
 
+-export([set_resp_not_found/2]).
+
 -import(rabbit_misc, [pget/2]).
 
 -include("rabbit_mgmt.hrl").
@@ -1178,3 +1180,18 @@ catch_no_such_user_or_vhost(Fun, Replacement) ->
 %% error is thrown when the request is out of range
 sublist(List, S, L) when is_integer(L), L >= 0 ->
     lists:sublist(lists:nthtail(S-1, List), L).
+
+-spec set_resp_not_found(binary(), cowboy_req:req()) -> cowboy_req:req().
+set_resp_not_found(NotFoundBin, ReqData) ->
+    ErrorMessage = case rabbit_mgmt_util:vhost(ReqData) of
+        not_found ->
+            <<"vhost_not_found">>;
+        _ ->
+            NotFoundBin
+    end,
+    ReqData1 = cowboy_req:set_resp_header(
+        <<"content-type">>, <<"application/json">>, ReqData),
+    cowboy_req:set_resp_body(rabbit_json:encode(#{
+        <<"error">> => <<"not_found">>,
+        <<"reason">> => ErrorMessage
+    }), ReqData1).

deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange_publish.erl

@@ -29,10 +29,13 @@ allowed_methods(ReqData, Context) ->
 content_types_provided(ReqData, Context) ->
    {rabbit_mgmt_util:responder_map(to_json), ReqData, Context}.
 
-resource_exists(ReqData, Context) ->
-    case rabbit_mgmt_wm_exchange:exchange(ReqData) of
-        not_found -> {false, set_resp_not_found(ReqData), Context};
-        _         -> {true, ReqData, Context}
+resource_exists(ReqData0, Context) ->
+    case rabbit_mgmt_wm_exchange:exchange(ReqData0) of
+        not_found ->
+            ReqData1 = rabbit_mgmt_util:set_resp_not_found(<<"exchange_not_found">>, ReqData0),
+            {false, ReqData1, Context};
+        _ ->
+            {true, ReqData0, Context}
     end.
 
 allow_missing_post(ReqData, Context) ->

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl

@@ -25,10 +25,13 @@ variances(Req, Context) ->
 allowed_methods(ReqData, Context) ->
     {[<<"POST">>, <<"OPTIONS">>], ReqData, Context}.
 
-resource_exists(ReqData, Context) ->
-    case rabbit_mgmt_wm_queue:queue(ReqData) of
-        not_found -> {false, set_resp_not_found(ReqData), Context};
-        _         -> {true, ReqData, Context}
+resource_exists(ReqData0, Context) ->
+    case rabbit_mgmt_wm_queue:queue(ReqData0) of
+        not_found ->
+            ReqData1 = rabbit_mgmt_util:set_resp_not_found(<<"queue_not_found">>, ReqData0),
+            {false, ReqData1, Context};
+        _ ->
+            {true, ReqData0, Context}
     end.
 
 allow_missing_post(ReqData, Context) ->
@@ -54,20 +57,6 @@ do_it(ReqData0, Context) ->
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_admin(ReqData, Context).
 
-set_resp_not_found(ReqData) ->
-    ErrorMessage = case rabbit_mgmt_util:vhost(ReqData) of
-        not_found ->
-            <<"vhost_not_found">>;
-        _ ->
-            <<"queue_not_found">>
-    end,
-    ReqData1 = cowboy_req:set_resp_header(
-        <<"content-type">>, <<"application/json">>, ReqData),
-    cowboy_req:set_resp_body(rabbit_json:encode(#{
-        <<"error">> => <<"not_found">>,
-        <<"reason">> => ErrorMessage
-    }), ReqData1).
-
 %%--------------------------------------------------------------------
 
 action(Else, _Q, ReqData, Context) ->

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_get.erl

@@ -29,10 +29,13 @@ allowed_methods(ReqData, Context) ->
 content_types_provided(ReqData, Context) ->
    {rabbit_mgmt_util:responder_map(to_json), ReqData, Context}.
 
-resource_exists(ReqData, Context) ->
-    case rabbit_mgmt_wm_queue:queue(ReqData) of
-        not_found -> {false, set_resp_not_found(ReqData), Context};
-        _         -> {true, ReqData, Context}
+resource_exists(ReqData0, Context) ->
+    case rabbit_mgmt_wm_queue:queue(ReqData0) of
+        not_found ->
+            ReqData1 = rabbit_mgmt_util:set_resp_not_found(<<"queue_not_found">>, ReqData0),
+            {false, ReqData1, Context};
+        _ ->
+            {true, ReqData0, Context}
     end.
 
 allow_missing_post(ReqData, Context) ->
@@ -152,20 +155,6 @@ basic_get(Ch, Q, AckMode, Enc, Trunc) ->
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
 
-set_resp_not_found(ReqData) ->
-    ErrorMessage = case rabbit_mgmt_util:vhost(ReqData) of
-        not_found ->
-            <<"vhost_not_found">>;
-        _ ->
-            <<"queue_not_found">>
-    end,
-    ReqData1 = cowboy_req:set_resp_header(
-        <<"content-type">>, <<"application/json">>, ReqData),
-    cowboy_req:set_resp_body(rabbit_json:encode(#{
-        <<"error">> => <<"not_found">>,
-        <<"reason">> => ErrorMessage
-    }), ReqData1).
-
 %%--------------------------------------------------------------------
 
 maybe_truncate(Payload, none)                         -> Payload;