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

chore: use put instead of post to update setting

This commit is contained in:
zhongwencool 2023-07-12 14:56:24 +08:00
parent f40d8318b7
commit a8b9b6f27f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib-ee/emqx_license/src/emqx_license_http_api.erl
View File

@ -54,6 +54,7 @@ schema("/license") ->
) )
} }
}, },
%% FIXME: It's a update action, should use put instead of post in 5.2.0
post => #{ post => #{
tags => ?LICENSE_TAGS, tags => ?LICENSE_TAGS,
summary => <<"Update license key">>, summary => <<"Update license key">>,
@ -93,7 +94,7 @@ schema("/license/setting") ->
200 => setting() 200 => setting()
} }
}, },
post => #{ put => #{
tags => ?LICENSE_TAGS, tags => ?LICENSE_TAGS,
summary => <<"Update license setting">>, summary => <<"Update license setting">>,
description => ?DESC("desc_license_setting_api"), description => ?DESC("desc_license_setting_api"),
@ -144,7 +145,7 @@ error_msg(Code, Msg) ->
'/license/setting'(get, _Params) -> '/license/setting'(get, _Params) ->
{200, maps:remove(<<"key">>, emqx_config:get_raw([license]))}; {200, maps:remove(<<"key">>, emqx_config:get_raw([license]))};
'/license/setting'(post, #{body := Setting}) -> '/license/setting'(put, #{body := Setting}) ->
case emqx_license:update_setting(Setting) of case emqx_license:update_setting(Setting) of
{error, Error} -> {error, Error} ->
?SLOG(error, #{ ?SLOG(error, #{

6
lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl
View File

@ -186,7 +186,7 @@ t_license_setting(_Config) ->
%% update %% update
Low = <<"50%">>, Low = <<"50%">>,
High = <<"55%">>, High = <<"55%">>,
UpdateRes = request(post, uri(["license", "setting"]), #{ UpdateRes = request(put, uri(["license", "setting"]), #{
<<"connection_low_watermark">> => Low, <<"connection_low_watermark">> => Low,
<<"connection_high_watermark">> => High <<"connection_high_watermark">> => High
}), }),
@ -197,14 +197,14 @@ t_license_setting(_Config) ->
%% update bad setting low >= high %% update bad setting low >= high
?assertMatch( ?assertMatch(
{ok, 400, _}, {ok, 400, _},
request(post, uri(["license", "setting"]), #{ request(put, uri(["license", "setting"]), #{
<<"connection_low_watermark">> => <<"50%">>, <<"connection_low_watermark">> => <<"50%">>,
<<"connection_high_watermark">> => <<"50%">> <<"connection_high_watermark">> => <<"50%">>
}) })
), ),
?assertMatch( ?assertMatch(
{ok, 400, _}, {ok, 400, _},
request(post, uri(["license", "setting"]), #{ request(put, uri(["license", "setting"]), #{
<<"connection_low_watermark">> => <<"51%">>, <<"connection_low_watermark">> => <<"51%">>,
<<"connection_high_watermark">> => <<"50%">> <<"connection_high_watermark">> => <<"50%">>
}) })