fix(tdengine): make password a required field (rv5.0)
Fixes https://emqx.atlassian.net/browse/EMQX-9395 ``` 2023-03-29T09:59:02.655495+00:00 [warning] msg: start_resource_failed, mfa: emqx_resource_manager:start_resource/2, line: 524, id: <<"bridge:tdengine:jimmoen-test-trigger">>, reason: {error,function_clause,[{emqx_ee_connector_tdengine,on_start,[<<"bridge:tdengine:jimmoen-test-trigger:1076">>,#{database => <<"db">>,enable => true,pool_size => 8,resource_opts => #{auto_restart_interval => 60000,batch_size => 1,batch_time => 0,health_check_interval => 15000,max_queue_bytes => 104857600,query_mode => sync,request_timeout => 15000,start_after_created => true,start_timeout => 5000,worker_pool_size => 16},server => "127.0.0.1",sql => <<"insert into mqtt.t_mqtt_msg(ts, msgid, mqtt_topic, qos, payload, arrived) values (${ts}, ${id}, ${topic}, ${qos}, ${payload}, ${timestamp})">>,username => <<"root">>}],[{file,"emqx_ee_connector_tdengine.erl"},{line,76}]},{emqx_resource,call_start,3,[{file,"emqx_resource.erl"},{line,359}]},{emqx_resource_manager,start_resource,2,[{file,"emqx_resource_manager.erl"},{line,513}]},{gen_statem,loop_state_callback,11,[{file,"gen_statem.erl"},{line,1205}]},{proc_lib,init_p_do_apply,3,[{file,"proc_lib.erl"},{line,226}]}]} ```
This commit is contained in:
parent
11c120f87c
commit
b2b9732edb
|
@ -16,6 +16,9 @@ services:
|
||||||
GITHUB_REF: ${GITHUB_REF}
|
GITHUB_REF: ${GITHUB_REF}
|
||||||
networks:
|
networks:
|
||||||
- emqx_bridge
|
- emqx_bridge
|
||||||
|
ports:
|
||||||
|
- 28083:18083
|
||||||
|
- 2883:1883
|
||||||
volumes:
|
volumes:
|
||||||
- ../..:/emqx
|
- ../..:/emqx
|
||||||
- /tmp/emqx-ci/emqx-shared-secret:/var/lib/secret
|
- /tmp/emqx-ci/emqx-shared-secret:/var/lib/secret
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{application, emqx_ee_connector, [
|
{application, emqx_ee_connector, [
|
||||||
{description, "EMQX Enterprise connectors"},
|
{description, "EMQX Enterprise connectors"},
|
||||||
{vsn, "0.1.7"},
|
{vsn, "0.1.8"},
|
||||||
{registered, []},
|
{registered, []},
|
||||||
{applications, [
|
{applications, [
|
||||||
kernel,
|
kernel,
|
||||||
|
|
|
@ -41,14 +41,16 @@ roots() ->
|
||||||
fields(config) ->
|
fields(config) ->
|
||||||
[
|
[
|
||||||
{server, server()}
|
{server, server()}
|
||||||
| add_default_username(emqx_connector_schema_lib:relational_db_fields())
|
| adjust_fields(emqx_connector_schema_lib:relational_db_fields())
|
||||||
].
|
].
|
||||||
|
|
||||||
add_default_username(Fields) ->
|
adjust_fields(Fields) ->
|
||||||
lists:map(
|
lists:map(
|
||||||
fun
|
fun
|
||||||
({username, OrigUsernameFn}) ->
|
({username, OrigUsernameFn}) ->
|
||||||
{username, add_default_fn(OrigUsernameFn, <<"root">>)};
|
{username, add_default_fn(OrigUsernameFn, <<"root">>)};
|
||||||
|
({password, OrigPasswordFn}) ->
|
||||||
|
{password, make_required_fn(OrigPasswordFn)};
|
||||||
(Field) ->
|
(Field) ->
|
||||||
Field
|
Field
|
||||||
end,
|
end,
|
||||||
|
@ -61,6 +63,12 @@ add_default_fn(OrigFn, Default) ->
|
||||||
(Field) -> OrigFn(Field)
|
(Field) -> OrigFn(Field)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
make_required_fn(OrigFn) ->
|
||||||
|
fun
|
||||||
|
(required) -> true;
|
||||||
|
(Field) -> OrigFn(Field)
|
||||||
|
end.
|
||||||
|
|
||||||
server() ->
|
server() ->
|
||||||
Meta = #{desc => ?DESC("server")},
|
Meta = #{desc => ?DESC("server")},
|
||||||
emqx_schema:servers_sc(Meta, ?TD_HOST_OPTIONS).
|
emqx_schema:servers_sc(Meta, ?TD_HOST_OPTIONS).
|
||||||
|
|
Loading…
Reference in New Issue