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

fix: don't require username and password 

not enforced by schema so we shouldn't either
This commit is contained in:
Stefan Strigler 2023-01-11 14:43:52 +01:00
parent 417d95d76f
commit 77f043dedf
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/emqx_connector/src/emqx_connector_mysql.erl
View File

@ -66,10 +66,21 @@ roots() ->
fields(config) -> fields(config) ->
[{server, server()}] ++ [{server, server()}] ++
emqx_connector_schema_lib:relational_db_fields() ++ add_default_username(emqx_connector_schema_lib:relational_db_fields(), []) ++
emqx_connector_schema_lib:ssl_fields() ++ emqx_connector_schema_lib:ssl_fields() ++
emqx_connector_schema_lib:prepare_statement_fields(). emqx_connector_schema_lib:prepare_statement_fields().
add_default_username([{username, OrigUsernameFn} | Tail], Head) ->
Head ++ [{username, add_default_fn(OrigUsernameFn, <<"root">>)} | Tail];
add_default_username([Field | Tail], Head) ->
add_default_username(Tail, Head ++ [Field]).
add_default_fn(OrigFn, Default) ->
fun
(default) -> Default;
(Field) -> OrigFn(Field)
end.
server() -> server() ->
Meta = #{desc => ?DESC("server")}, Meta = #{desc => ?DESC("server")},
emqx_schema:servers_sc(Meta, ?MYSQL_HOST_OPTIONS). emqx_schema:servers_sc(Meta, ?MYSQL_HOST_OPTIONS).
@ -83,8 +94,7 @@ on_start(
#{ #{
server := Server, server := Server,
database := DB, database := DB,
username := User, username := Username,
password := Password,
auto_reconnect := AutoReconn, auto_reconnect := AutoReconn,
pool_size := PoolSize, pool_size := PoolSize,
ssl := SSL ssl := SSL
@ -104,13 +114,15 @@ on_start(
[] []
end, end,
Options = [ Options = [
{host, Host}, maybe_password_opt(maps:get(password, Config, undefined))
{port, Port}, | [
{user, User}, {host, Host},
{password, Password}, {port, Port},
{database, DB}, {user, Username},
{auto_reconnect, reconn_interval(AutoReconn)}, {database, DB},
{pool_size, PoolSize} {auto_reconnect, reconn_interval(AutoReconn)},
{pool_size, PoolSize}
]
], ],
PoolName = emqx_plugin_libs_pool:pool_name(InstId), PoolName = emqx_plugin_libs_pool:pool_name(InstId),
Prepares = parse_prepare_sql(Config), Prepares = parse_prepare_sql(Config),
@ -126,6 +138,11 @@ on_start(
{error, Reason} {error, Reason}
end. end.
maybe_password_opt(undefined) ->
[];
maybe_password_opt(Password) ->
{password, Password}.
on_stop(InstId, #{poolname := PoolName}) -> on_stop(InstId, #{poolname := PoolName}) ->
?SLOG(info, #{ ?SLOG(info, #{
msg => "stopping_mysql_connector", msg => "stopping_mysql_connector",