refactor: redis bridge to its own application
This commit refactor the redis bridge to its own application. Fixes: https://emqx.atlassian.net/browse/EMQX-9534
This commit is contained in:
parent
dd6aa96c99
commit
e76daa0f3b
|
@ -0,0 +1,3 @@
|
||||||
|
toxiproxy
|
||||||
|
redis
|
||||||
|
redis_cluster
|
|
@ -0,0 +1,11 @@
|
||||||
|
%% -*- mode: erlang; -*-
|
||||||
|
{erl_opts, [debug_info]}.
|
||||||
|
{deps, [ {emqx_connector, {path, "../../apps/emqx_connector"}}
|
||||||
|
, {emqx_resource, {path, "../../apps/emqx_resource"}}
|
||||||
|
, {emqx_bridge, {path, "../../apps/emqx_bridge"}}
|
||||||
|
, {emqx_redis, {path, "../../apps/emqx_redis"}}
|
||||||
|
]}.
|
||||||
|
|
||||||
|
{shell, [
|
||||||
|
{apps, [emqx_bridge_redis]}
|
||||||
|
]}.
|
|
@ -1,8 +1,8 @@
|
||||||
{application, emqx_bridge_redis, [
|
{application, emqx_bridge_redis, [
|
||||||
{description, "EMQX Enterprise Redis Bridge"},
|
{description, "EMQX Enterprise Redis Bridge"},
|
||||||
{vsn, "0.1.0"},
|
{vsn, "0.1.1"},
|
||||||
{registered, []},
|
{registered, []},
|
||||||
{applications, [kernel, stdlib]},
|
{applications, [kernel, stdlib, emqx_connector, emqx_resource, emqx_bridge, emqx_redis]},
|
||||||
{env, []},
|
{env, []},
|
||||||
{modules, []},
|
{modules, []},
|
||||||
{links, []}
|
{links, []}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
|
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
-module(emqx_ee_bridge_redis).
|
-module(emqx_bridge_redis).
|
||||||
|
|
||||||
-include_lib("typerefl/include/types.hrl").
|
-include_lib("typerefl/include/types.hrl").
|
||||||
-include_lib("hocon/include/hoconsc.hrl").
|
-include_lib("hocon/include/hoconsc.hrl").
|
|
@ -1,7 +1,7 @@
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
|
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
-module(emqx_ee_connector_redis).
|
-module(emqx_bridge_redis_connector).
|
||||||
|
|
||||||
-include_lib("emqx/include/logger.hrl").
|
-include_lib("emqx/include/logger.hrl").
|
||||||
-include_lib("snabbkaffe/include/snabbkaffe.hrl").
|
-include_lib("snabbkaffe/include/snabbkaffe.hrl").
|
|
@ -1,7 +1,7 @@
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
|
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
-module(emqx_ee_bridge_redis_SUITE).
|
-module(emqx_bridge_redis_SUITE).
|
||||||
|
|
||||||
-compile(nowarn_export_all).
|
-compile(nowarn_export_all).
|
||||||
-compile(export_all).
|
-compile(export_all).
|
||||||
|
@ -233,7 +233,7 @@ t_check_values(_Config) ->
|
||||||
end,
|
end,
|
||||||
lists:flatmap(
|
lists:flatmap(
|
||||||
fun maps:to_list/1,
|
fun maps:to_list/1,
|
||||||
emqx_ee_bridge_redis:conn_bridge_examples(Method)
|
emqx_bridge_redis:conn_bridge_examples(Method)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
end,
|
end,
|
||||||
|
@ -411,7 +411,7 @@ conf_schema(StructName) ->
|
||||||
translations => #{},
|
translations => #{},
|
||||||
validations => [],
|
validations => [],
|
||||||
namespace => undefined,
|
namespace => undefined,
|
||||||
roots => [{root, hoconsc:ref(emqx_ee_bridge_redis, StructName)}]
|
roots => [{root, hoconsc:ref(emqx_bridge_redis, StructName)}]
|
||||||
}.
|
}.
|
||||||
|
|
||||||
delete_all_rules() ->
|
delete_all_rules() ->
|
|
@ -1,4 +1,2 @@
|
||||||
toxiproxy
|
toxiproxy
|
||||||
mysql
|
mysql
|
||||||
redis
|
|
||||||
redis_cluster
|
|
||||||
|
|
|
@ -33,9 +33,9 @@ api_schemas(Method) ->
|
||||||
api_ref(emqx_ee_bridge_hstreamdb, <<"hstreamdb">>, Method),
|
api_ref(emqx_ee_bridge_hstreamdb, <<"hstreamdb">>, Method),
|
||||||
api_ref(emqx_bridge_influxdb, <<"influxdb_api_v1">>, Method ++ "_api_v1"),
|
api_ref(emqx_bridge_influxdb, <<"influxdb_api_v1">>, Method ++ "_api_v1"),
|
||||||
api_ref(emqx_bridge_influxdb, <<"influxdb_api_v2">>, Method ++ "_api_v2"),
|
api_ref(emqx_bridge_influxdb, <<"influxdb_api_v2">>, Method ++ "_api_v2"),
|
||||||
api_ref(emqx_ee_bridge_redis, <<"redis_single">>, Method ++ "_single"),
|
api_ref(emqx_bridge_redis, <<"redis_single">>, Method ++ "_single"),
|
||||||
api_ref(emqx_ee_bridge_redis, <<"redis_sentinel">>, Method ++ "_sentinel"),
|
api_ref(emqx_bridge_redis, <<"redis_sentinel">>, Method ++ "_sentinel"),
|
||||||
api_ref(emqx_ee_bridge_redis, <<"redis_cluster">>, Method ++ "_cluster"),
|
api_ref(emqx_bridge_redis, <<"redis_cluster">>, Method ++ "_cluster"),
|
||||||
api_ref(emqx_bridge_timescale, <<"timescale">>, Method),
|
api_ref(emqx_bridge_timescale, <<"timescale">>, Method),
|
||||||
api_ref(emqx_bridge_matrix, <<"matrix">>, Method),
|
api_ref(emqx_bridge_matrix, <<"matrix">>, Method),
|
||||||
api_ref(emqx_bridge_tdengine, <<"tdengine">>, Method),
|
api_ref(emqx_bridge_tdengine, <<"tdengine">>, Method),
|
||||||
|
@ -59,7 +59,7 @@ schema_modules() ->
|
||||||
emqx_bridge_influxdb,
|
emqx_bridge_influxdb,
|
||||||
emqx_bridge_mongodb,
|
emqx_bridge_mongodb,
|
||||||
emqx_ee_bridge_mysql,
|
emqx_ee_bridge_mysql,
|
||||||
emqx_ee_bridge_redis,
|
emqx_bridge_redis,
|
||||||
emqx_bridge_pgsql,
|
emqx_bridge_pgsql,
|
||||||
emqx_bridge_timescale,
|
emqx_bridge_timescale,
|
||||||
emqx_bridge_matrix,
|
emqx_bridge_matrix,
|
||||||
|
@ -102,9 +102,9 @@ resource_type(mongodb_single) -> emqx_bridge_mongodb_connector;
|
||||||
resource_type(mysql) -> emqx_connector_mysql;
|
resource_type(mysql) -> emqx_connector_mysql;
|
||||||
resource_type(influxdb_api_v1) -> emqx_bridge_influxdb_connector;
|
resource_type(influxdb_api_v1) -> emqx_bridge_influxdb_connector;
|
||||||
resource_type(influxdb_api_v2) -> emqx_bridge_influxdb_connector;
|
resource_type(influxdb_api_v2) -> emqx_bridge_influxdb_connector;
|
||||||
resource_type(redis_single) -> emqx_ee_connector_redis;
|
resource_type(redis_single) -> emqx_bridge_redis_connector;
|
||||||
resource_type(redis_sentinel) -> emqx_ee_connector_redis;
|
resource_type(redis_sentinel) -> emqx_bridge_redis_connector;
|
||||||
resource_type(redis_cluster) -> emqx_ee_connector_redis;
|
resource_type(redis_cluster) -> emqx_bridge_redis_connector;
|
||||||
resource_type(pgsql) -> emqx_connector_pgsql;
|
resource_type(pgsql) -> emqx_connector_pgsql;
|
||||||
resource_type(timescale) -> emqx_connector_pgsql;
|
resource_type(timescale) -> emqx_connector_pgsql;
|
||||||
resource_type(matrix) -> emqx_connector_pgsql;
|
resource_type(matrix) -> emqx_connector_pgsql;
|
||||||
|
@ -287,7 +287,7 @@ redis_structs() ->
|
||||||
[
|
[
|
||||||
{Type,
|
{Type,
|
||||||
mk(
|
mk(
|
||||||
hoconsc:map(name, ref(emqx_ee_bridge_redis, Type)),
|
hoconsc:map(name, ref(emqx_bridge_redis, Type)),
|
||||||
#{
|
#{
|
||||||
desc => <<"Redis Bridge Config">>,
|
desc => <<"Redis Bridge Config">>,
|
||||||
required => false
|
required => false
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
emqx_ee_bridge_redis {
|
emqx_bridge_redis {
|
||||||
|
|
||||||
command_template.desc:
|
command_template.desc:
|
||||||
"""Redis command template used to export messages. Each list element stands for a command name or its argument.
|
"""Redis command template used to export messages. Each list element stands for a command name or its argument.
|
Loading…
Reference in New Issue