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

fix: enusre plugin installed when do config operation

This commit is contained in:
JimMoen 2024-04-25 14:32:32 +08:00
parent b0aa3bb70f
commit 1869f6fd0a
No known key found for this signature in database
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/emqx_management/src/emqx_mgmt_api_plugins.erl
View File

@ -200,7 +200,7 @@ schema("/plugins/:name/config") ->
responses => #{
204 => <<"Config updated successfully">>,
400 => emqx_dashboard_swagger:error_codes(
['UNEXPECTED_ERROR'], <<"Update plugin config failed">>
['BAD_CONFIG', 'UNEXPECTED_ERROR'], <<"Update plugin config failed">>
),
404 => emqx_dashboard_swagger:error_codes(['NOT_FOUND'], <<"Plugin Not Found">>)
}
@ -485,8 +485,10 @@ update_plugin(put, #{bindings := #{name := Name, action := Action}}) ->
Res = emqx_mgmt_api_plugins_proto_v2:ensure_action(Name, Action),
return(204, Res).
plugin_config(get, #{bindings := #{name := Name}}) ->
case emqx_plugins:get_plugin_config(Name, #{format => ?CONFIG_FORMAT_MAP}) of
plugin_config(get, #{bindings := #{name := NameVsn}}) ->
case emqx_plugins:describe(NameVsn) of
{ok, _} ->
case emqx_plugins:get_plugin_config(NameVsn, #{format => ?CONFIG_FORMAT_MAP}) of
{ok, AvroJson} ->
{200, #{<<"content-type">> => <<"'application/json'">>}, AvroJson};
{error, _} ->
@ -495,14 +497,19 @@ plugin_config(get, #{bindings := #{name := Name}}) ->
message => <<"Failed to get plugin config">>
}}
end;
plugin_config(put, #{bindings := #{name := Name}, body := AvroJsonMap}) ->
_ ->
{404, plugin_not_found_msg()}
end;
plugin_config(put, #{bindings := #{name := NameVsn}, body := AvroJsonMap}) ->
case emqx_plugins:describe(NameVsn) of
{ok, _} ->
AvroJsonBin = emqx_utils_json:encode(AvroJsonMap),
case emqx_plugins:decode_plugin_avro_config(Name, AvroJsonBin) of
case emqx_plugins:decode_plugin_avro_config(NameVsn, AvroJsonBin) of
{ok, AvroValueConfig} ->
Nodes = emqx:running_nodes(),
%% cluster call with config in map (binary key-value)
_Res = emqx_mgmt_api_plugins_proto_v3:update_plugin_config(
Nodes, Name, AvroJsonMap, AvroValueConfig
Nodes, NameVsn, AvroJsonMap, AvroValueConfig
),
{204};
{error, Reason} ->
@ -510,6 +517,9 @@ plugin_config(put, #{bindings := #{name := Name}, body := AvroJsonMap}) ->
code => 'BAD_CONFIG',
message => readable_error_msg(Reason)
}}
end;
_ ->
{404, plugin_not_found_msg()}
end.
plugin_schema(get, #{bindings := #{name := NameVsn}}) ->
@ -517,10 +527,7 @@ plugin_schema(get, #{bindings := #{name := NameVsn}}) ->
{ok, _Plugin} ->
{200, format_plugin_avsc_and_i18n(NameVsn)};
_ ->
{404, #{
code => 'NOT_FOUND',
message => <<"Plugin Not Found">>
}}
{404, plugin_not_found_msg()}
end.
update_boot_order(post, #{bindings := #{name := Name}, body := Body}) ->
@ -610,6 +617,12 @@ return(_, {error, #{error_msg := "bad_avro_config_file", reason := {enoent, _} =
return(_, {error, Reason}) ->
{400, #{code => 'PARAM_ERROR', message => readable_error_msg(Reason)}}.
plugin_not_found_msg() ->
#{
code => 'NOT_FOUND',
message => <<"Plugin Not Found">>
}.
readable_error_msg(Msg) ->
emqx_utils:readable_error_msg(Msg).

4
apps/emqx_management/src/proto/emqx_mgmt_api_plugins_proto_v3.erl
View File

@ -59,11 +59,11 @@ ensure_action(Name, Action) ->
map()
) ->
emqx_rpc:multicall_result().
update_plugin_config(Nodes, Name, AvroJsonMap, PluginConfig) ->
update_plugin_config(Nodes, NameVsn, AvroJsonMap, PluginConfig) ->
rpc:multicall(
Nodes,
emqx_mgmt_api_plugins,
do_update_plugin_config,
[Name, AvroJsonMap, PluginConfig],
[NameVsn, AvroJsonMap, PluginConfig],
10000
).