yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: return 409 in case of duplicate

This commit is contained in:
Stefan Strigler 2022-12-07 14:07:03 +01:00
parent 5b144cd5aa
commit 2a27d2e781
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/emqx_management/src/emqx_mgmt_api_trace.erl
View File

@ -84,11 +84,16 @@ schema("/trace") ->
200 => hoconsc:ref(trace), 200 => hoconsc:ref(trace),
400 => emqx_dashboard_swagger:error_codes( 400 => emqx_dashboard_swagger:error_codes(
[ [
'ALREADY_EXISTS',
'DUPLICATE_CONDITION',
'INVALID_PARAMS' 'INVALID_PARAMS'
], ],
<<"trace name already exists">> <<"invalid trace params">>
),
409 => emqx_dashboard_swagger:error_codes(
[
'ALREADY_EXISTS',
'DUPLICATE_CONDITION'
],
<<"trace already exists">>
) )
} }
}, },
@ -392,12 +397,12 @@ trace(post, #{body := Param}) ->
{ok, Trace0} -> {ok, Trace0} ->
{200, format_trace(Trace0)}; {200, format_trace(Trace0)};
{error, {already_existed, Name}} -> {error, {already_existed, Name}} ->
{400, #{ {409, #{
code => 'ALREADY_EXISTS', code => 'ALREADY_EXISTS',
message => ?TO_BIN([Name, " Already Exists"]) message => ?TO_BIN([Name, " Already Exists"])
}}; }};
{error, {duplicate_condition, Name}} -> {error, {duplicate_condition, Name}} ->
{400, #{ {409, #{
code => 'DUPLICATE_CONDITION', code => 'DUPLICATE_CONDITION',
message => ?TO_BIN([Name, " Duplication Condition"]) message => ?TO_BIN([Name, " Duplication Condition"])
}}; }};

12
apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
View File

@ -149,7 +149,7 @@ t_create_failed(_Config) ->
{ok, Create} = request_api(post, api_path("trace"), Header, [GoodName | Trace]), {ok, Create} = request_api(post, api_path("trace"), Header, [GoodName | Trace]),
?assertMatch(#{<<"name">> := <<"test-name-0">>}, json(Create)), ?assertMatch(#{<<"name">> := <<"test-name-0">>}, json(Create)),
?assertMatch( ?assertMatch(
{error, {"HTTP/1.1", 400, _}, _}, {error, {"HTTP/1.1", 409, _}, _},
request_api(post, api_path("trace"), Header, [GoodName | Trace]) request_api(post, api_path("trace"), Header, [GoodName | Trace])
), ),
@ -171,6 +171,16 @@ t_create_failed(_Config) ->
{error, {"HTTP/1.1", 400, _}, _}, {error, {"HTTP/1.1", 400, _}, _},
request_api(post, api_path("trace"), Header, [GoodName1 | Trace]) request_api(post, api_path("trace"), Header, [GoodName1 | Trace])
), ),
%% clear
?assertMatch({ok, _}, request_api(delete, api_path("trace"), Header, [])),
{ok, Create} = request_api(post, api_path("trace"), Header, [GoodName | Trace]),
%% new name but same trace
GoodName2 = {<<"name">>, <<"test-name-1">>},
?assertMatch(
{error, {"HTTP/1.1", 409, _}, _},
request_api(post, api_path("trace"), Header, [GoodName2 | Trace])
),
unload(), unload(),
emqx_trace:clear(), emqx_trace:clear(),
ok. ok.