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

refactor: make all bridges optional (required = false)

This commit is contained in:
Zaiming (Stone) Shi 2022-11-30 23:19:35 +01:00
parent 7adb539ae1
commit 9ea22d062d
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_bridge/src/schema/emqx_bridge_mqtt_config.erl
View File

@ -14,6 +14,8 @@
%% limitations under the License.
%%--------------------------------------------------------------------
%% @doc This module was created to convert old version (from v5.0.0 to v5.0.11)
%% mqtt connector configs to newer version (developed for enterprise edition).
-module(emqx_bridge_mqtt_config).
-export([

6
apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
View File

@ -96,13 +96,17 @@ fields(bridges) ->
{webhook,
mk(
hoconsc:map(name, ref(emqx_bridge_webhook_schema, "config")),
#{desc => ?DESC("bridges_webhook")}
#{
desc => ?DESC("bridges_webhook"),
required => false
}
)},
{mqtt,
mk(
hoconsc:map(name, ref(emqx_bridge_mqtt_schema, "config")),
#{
desc => ?DESC("bridges_mqtt"),
required => false,
converter => fun emqx_bridge_mqtt_config:upgrade_pre_ee/1
}
)}

25
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
View File

@ -62,17 +62,26 @@ fields(bridges) ->
{kafka,
mk(
hoconsc:map(name, ref(emqx_ee_bridge_kafka, "config")),
#{desc => <<"EMQX Enterprise Config">>}
#{
desc => <<"Kafka Bridge Config">>,
required => false
}
)},
{hstreamdb,
mk(
hoconsc:map(name, ref(emqx_ee_bridge_hstreamdb, "config")),
#{desc => <<"EMQX Enterprise Config">>}
#{
desc => <<"HStreamDB Bridge Config">>,
required => false
}
)},
{mysql,
mk(
hoconsc:map(name, ref(emqx_ee_bridge_mysql, "config")),
#{desc => <<"EMQX Enterprise Config">>}
#{
desc => <<"MySQL Bridge Config">>,
required => false
}
)}
] ++ mongodb_structs() ++ influxdb_structs().
@ -81,7 +90,10 @@ mongodb_structs() ->
{Type,
mk(
hoconsc:map(name, ref(emqx_ee_bridge_mongodb, Type)),
#{desc => <<"EMQX Enterprise Config">>}
#{
desc => <<"MongoDB Bridge Config">>,
required => false
}
)}
|| Type <- [mongodb_rs, mongodb_sharded, mongodb_single]
].
@ -91,7 +103,10 @@ influxdb_structs() ->
{Protocol,
mk(
hoconsc:map(name, ref(emqx_ee_bridge_influxdb, Protocol)),
#{desc => <<"EMQX Enterprise Config">>}
#{
desc => <<"InfluxDB Bridge Config">>,
required => false
}
)}
|| Protocol <- [
%% influxdb_udp,