Просмотр исходного кода

refactor: change the parameters to union type

JianBo He 1 год назад
Родитель
Сommit
2e74831a0f

+ 1 - 1
apps/emqx_bridge_datalayers/src/emqx_bridge_datalayers.app.src

@@ -1,6 +1,6 @@
 {application, emqx_bridge_datalayers, [
     {description, "EMQX Enterprise Datalayers Bridge"},
-    {vsn, "0.1.0"},
+    {vsn, "0.1.1"},
     {registered, []},
     {applications, [
         kernel,

+ 6 - 3
apps/emqx_bridge_datalayers/src/emqx_bridge_datalayers_connector.erl

@@ -237,11 +237,13 @@ fields("connector") ->
         server_field(),
         {parameters,
             mk(
-                ref(?MODULE, "datalayers_parameters"),
+                hoconsc:union([
+                    ref(?MODULE, "datalayers_influxdb_v1_parameters")
+                ]),
                 #{required => true, desc => ?DESC("datalayers_parameters")}
             )}
     ] ++ emqx_connector_schema_lib:ssl_fields();
-fields("datalayers_parameters") ->
+fields("datalayers_influxdb_v1_parameters") ->
     datalayers_parameters_fields().
 
 server_field() ->
@@ -259,6 +261,7 @@ precision_field() ->
 
 datalayers_parameters_fields() ->
     [
+        {driver_type, mk(enum([influxdb_v1]), #{required => true, desc => ?DESC("driver_type")})},
         {database, mk(binary(), #{required => true, desc => ?DESC("database")})},
         {username, mk(binary(), #{desc => ?DESC("username")})},
         {password, emqx_schema_secret:mk(#{desc => ?DESC("password")})}
@@ -277,7 +280,7 @@ desc(common) ->
     ?DESC("common");
 desc(parameters) ->
     ?DESC("dayalayers_parameters");
-desc("datalayers_parameters") ->
+desc("datalayers_influxdb_v1_parameters") ->
     ?DESC("datalayers_parameters");
 desc(datalayers_api) ->
     ?DESC("datalayers_api");

+ 1 - 0
apps/emqx_bridge_datalayers/test/emqx_bridge_datalayers_connector_SUITE.erl

@@ -236,6 +236,7 @@ datalayers_connector_config(Host, Port, SslEnabled, Verify) ->
     Server = list_to_binary(io_lib:format("~s:~b", [Host, Port])),
     ConnectorConf = #{
         <<"parameters">> => #{
+            <<"driver_type">> => <<"influxdb_v1">>,
             <<"database">> => <<"mqtt">>,
             <<"username">> => <<"admin">>,
             <<"password">> => <<"public">>

+ 6 - 0
rel/i18n/emqx_bridge_datalayers_connector.hocon

@@ -38,6 +38,12 @@ username.desc:
 username.label:
 """Username"""
 
+driver_type.label:
+"""Driver Type"""
+
+driver_type.desc:
+"""The Driver used to communicate with Datalayers service."""
+
 datalayers_parameters.label:
 """Datalayers Specific Parameters"""