瀏覽代碼

fix(bridge_api): fix response status code for some operations

Thales Macedo Garitezi 2 年之前
父節點
當前提交
84e78f5d2e
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 5 0
      apps/emqx_bridge/src/emqx_bridge_api.erl
  2. 1 1
      apps/emqx_bridge/src/emqx_bridge_v2_api.erl

+ 5 - 0
apps/emqx_bridge/src/emqx_bridge_api.erl

@@ -387,6 +387,7 @@ schema("/bridges/:id/enable/:enable") ->
                 responses =>
                     #{
                         204 => <<"Success">>,
+                        400 => error_schema('BAD_REQUEST', non_compat_bridge_msg()),
                         404 => error_schema('NOT_FOUND', "Bridge not found or invalid operation"),
                         503 => error_schema('SERVICE_UNAVAILABLE', "Service unavailable")
                     }
@@ -667,6 +668,10 @@ get_metrics_from_local_node(BridgeType0, BridgeName) ->
                         ?SERVICE_UNAVAILABLE(<<"request timeout">>);
                     {error, timeout} ->
                         ?SERVICE_UNAVAILABLE(<<"request timeout">>);
+                    {error, not_bridge_v1_compatible} ->
+                        ?BAD_REQUEST(non_compat_bridge_msg());
+                    {error, bridge_not_found} ->
+                        ?BRIDGE_NOT_FOUND(BridgeType, BridgeName);
                     {error, Reason} ->
                         ?INTERNAL_ERROR(Reason)
                 end

+ 1 - 1
apps/emqx_bridge/src/emqx_bridge_v2_api.erl

@@ -394,7 +394,7 @@ schema("/bridges_v2_probe") ->
         case emqx_bridge_v2:disable_enable(enable_func(Enable), BridgeType, BridgeName) of
             {ok, _} ->
                 ?NO_CONTENT;
-            {error, {pre_config_update, _, not_found}} ->
+            {error, {pre_config_update, _, bridge_not_found}} ->
                 ?BRIDGE_NOT_FOUND(BridgeType, BridgeName);
             {error, {_, _, timeout}} ->
                 ?SERVICE_UNAVAILABLE(<<"request timeout">>);