diff --git a/apps/emqx_bridge/src/emqx_bridge_resource.erl b/apps/emqx_bridge/src/emqx_bridge_resource.erl index 65e05b950..0756e1382 100644 --- a/apps/emqx_bridge/src/emqx_bridge_resource.erl +++ b/apps/emqx_bridge/src/emqx_bridge_resource.erl @@ -49,11 +49,8 @@ update/4 ]). --callback connector_config(ParsedConfig, BridgeName :: atom() | binary()) -> - ParsedConfig -when - ParsedConfig :: #{atom() => any()}. --optional_callbacks([connector_config/2]). +-callback connector_config(ParsedConfig) -> ParsedConfig when ParsedConfig :: #{atom() => any()}. +-optional_callbacks([connector_config/1]). %% bi-directional bridge with producer/consumer or ingress/egress configs -define(IS_BI_DIR_BRIDGE(TYPE), @@ -391,14 +388,14 @@ parse_confs(Type, Name, Conf) when ?IS_INGRESS_BRIDGE(Type) -> BId = bridge_id(Type, Name), BridgeHookpoint = bridge_hookpoint(BId), Conf#{hookpoint => BridgeHookpoint}; -parse_confs(BridgeType, BridgeName, Config) -> - connector_config(BridgeType, BridgeName, Config). +parse_confs(BridgeType, _BridgeName, Config) -> + connector_config(BridgeType, Config). -connector_config(BridgeType, BridgeName, Config) -> +connector_config(BridgeType, Config) -> Mod = bridge_impl_module(BridgeType), - case erlang:function_exported(Mod, connector_config, 2) of + case erlang:function_exported(Mod, connector_config, 1) of true -> - Mod:connector_config(Config, BridgeName); + Mod:connector_config(Config); false -> Config end. diff --git a/apps/emqx_bridge_azure_event_hub/src/emqx_bridge_azure_event_hub.erl b/apps/emqx_bridge_azure_event_hub/src/emqx_bridge_azure_event_hub.erl index b34d6132a..abdc6a265 100644 --- a/apps/emqx_bridge_azure_event_hub/src/emqx_bridge_azure_event_hub.erl +++ b/apps/emqx_bridge_azure_event_hub/src/emqx_bridge_azure_event_hub.erl @@ -20,7 +20,7 @@ %% emqx_bridge_enterprise "unofficial" API -export([conn_bridge_examples/1]). --export([connector_config/2]). +-export([connector_config/1]). -export([producer_converter/2, host_opts/0]). @@ -166,7 +166,7 @@ values(producer) -> %% `emqx_bridge_resource' API %%------------------------------------------------------------------------------------------------- -connector_config(Config, _BridgeName) -> +connector_config(Config) -> %% Default port for AEH is 9093 BootstrapHosts0 = maps:get(bootstrap_hosts, Config), BootstrapHosts = emqx_schema:parse_servers(