refactor(mysql connector): to use emqx_connector_info

This commit refactors the mysql connector to use the
`emqx_connector_info` behavior.
This commit is contained in:
Kjell Winblad 2024-03-20 11:12:38 +01:00
parent c6d7c57bbd
commit 223bbc05fe
5 changed files with 49 additions and 17 deletions

View File

@ -1,6 +1,6 @@
{application, emqx_bridge_mysql, [ {application, emqx_bridge_mysql, [
{description, "EMQX Enterprise MySQL Bridge"}, {description, "EMQX Enterprise MySQL Bridge"},
{vsn, "0.1.4"}, {vsn, "0.1.5"},
{registered, []}, {registered, []},
{applications, [ {applications, [
kernel, kernel,
@ -8,7 +8,10 @@
emqx_resource, emqx_resource,
emqx_mysql emqx_mysql
]}, ]},
{env, [{emqx_action_info_modules, [emqx_bridge_mysql_action_info]}]}, {env, [
{emqx_action_info_modules, [emqx_bridge_mysql_action_info]},
{emqx_connector_info_modules, [emqx_bridge_mysql_connector_info]}
]},
{modules, []}, {modules, []},
{links, []} {links, []}
]}. ]}.

View File

@ -0,0 +1,42 @@
%%--------------------------------------------------------------------
%% Copyright (c) 2023-2024 EMQ Technologies Co., Ltd. All Rights Reserved.
%%--------------------------------------------------------------------
-module(emqx_bridge_mysql_connector_info).
-behaviour(emqx_connector_info).
-export([
type_name/0,
bridge_types/0,
resource_callback_module/0,
config_schema/0,
schema_module/0,
api_schema/1
]).
type_name() ->
mysql.
bridge_types() ->
[mysql].
resource_callback_module() ->
emqx_bridge_mysql_connector.
config_schema() ->
{mysql,
hoconsc:mk(
hoconsc:map(name, hoconsc:ref(emqx_bridge_mysql, "config_connector")),
#{
desc => <<"MySQL Connector Config">>,
required => false
}
)}.
schema_module() ->
emqx_bridge_mysql.
api_schema(Method) ->
emqx_connector_schema:api_ref(
emqx_bridge_mysql, <<"mysql">>, Method ++ "_connector"
).

View File

@ -72,7 +72,8 @@ hard_coded_connector_info_modules_ee() ->
emqx_bridge_oracle_connector_info, emqx_bridge_oracle_connector_info,
emqx_bridge_influxdb_connector_info, emqx_bridge_influxdb_connector_info,
emqx_bridge_cassandra_connector_info, emqx_bridge_cassandra_connector_info,
emqx_bridge_clickhouse_connector_info emqx_bridge_clickhouse_connector_info,
emqx_bridge_mysql_connector_info
]. ].
-else. -else.
hard_coded_connector_info_modules_ee() -> hard_coded_connector_info_modules_ee() ->

View File

@ -21,8 +21,6 @@
resource_type(Type) when is_binary(Type) -> resource_type(Type) when is_binary(Type) ->
resource_type(binary_to_atom(Type, utf8)); resource_type(binary_to_atom(Type, utf8));
resource_type(mysql) ->
emqx_bridge_mysql_connector;
resource_type(syskeeper_forwarder) -> resource_type(syskeeper_forwarder) ->
emqx_bridge_syskeeper_connector; emqx_bridge_syskeeper_connector;
resource_type(syskeeper_proxy) -> resource_type(syskeeper_proxy) ->
@ -77,14 +75,6 @@ fields(connectors) ->
connector_structs() -> connector_structs() ->
[ [
{mysql,
mk(
hoconsc:map(name, ref(emqx_bridge_mysql, "config_connector")),
#{
desc => <<"MySQL Connector Config">>,
required => false
}
)},
{redis, {redis,
mk( mk(
hoconsc:map(name, ref(emqx_bridge_redis_schema, "config_connector")), hoconsc:map(name, ref(emqx_bridge_redis_schema, "config_connector")),
@ -193,7 +183,6 @@ connector_structs() ->
schema_modules() -> schema_modules() ->
[ [
emqx_bridge_mysql,
emqx_bridge_syskeeper_connector, emqx_bridge_syskeeper_connector,
emqx_bridge_syskeeper_proxy, emqx_bridge_syskeeper_proxy,
emqx_bridge_sqlserver, emqx_bridge_sqlserver,
@ -214,7 +203,6 @@ api_schemas(Method) ->
[ [
%% We need to map the `type' field of a request (binary) to a %% We need to map the `type' field of a request (binary) to a
%% connector schema module. %% connector schema module.
api_ref(emqx_bridge_mysql, <<"mysql">>, Method ++ "_connector"),
api_ref(emqx_bridge_syskeeper_connector, <<"syskeeper_forwarder">>, Method), api_ref(emqx_bridge_syskeeper_connector, <<"syskeeper_forwarder">>, Method),
api_ref(emqx_bridge_syskeeper_proxy, <<"syskeeper_proxy">>, Method), api_ref(emqx_bridge_syskeeper_proxy, <<"syskeeper_proxy">>, Method),
api_ref(emqx_bridge_sqlserver, <<"sqlserver">>, Method ++ "_connector"), api_ref(emqx_bridge_sqlserver, <<"sqlserver">>, Method ++ "_connector"),

View File

@ -127,8 +127,6 @@ connector_info_schema_modules() ->
%% @doc Return old bridge(v1) and/or connector(v2) type %% @doc Return old bridge(v1) and/or connector(v2) type
%% from the latest connector type name. %% from the latest connector type name.
connector_type_to_bridge_types(mysql) ->
[mysql];
connector_type_to_bridge_types(mqtt) -> connector_type_to_bridge_types(mqtt) ->
[mqtt]; [mqtt];
connector_type_to_bridge_types(redis) -> connector_type_to_bridge_types(redis) ->