Sfoglia il codice sorgente

refactor: rename bridge greptimedb_grpc_v1 to greptimedb

Dennis Zhuang 2 anni fa
parent
commit
c9550cc2e5

+ 1 - 1
apps/emqx_bridge/src/emqx_bridge.erl

@@ -90,7 +90,7 @@
     T == oracle;
     T == oracle;
     T == iotdb;
     T == iotdb;
     T == kinesis_producer;
     T == kinesis_producer;
-    T == greptimedb_grpc_v1
+    T == greptimedb
 ).
 ).
 
 
 -define(ROOT_KEY, bridges).
 -define(ROOT_KEY, bridges).

+ 3 - 3
apps/emqx_bridge/src/schema/emqx_bridge_enterprise.erl

@@ -50,7 +50,7 @@ api_schemas(Method) ->
         api_ref(emqx_bridge_iotdb, <<"iotdb">>, Method),
         api_ref(emqx_bridge_iotdb, <<"iotdb">>, Method),
         api_ref(emqx_bridge_rabbitmq, <<"rabbitmq">>, Method),
         api_ref(emqx_bridge_rabbitmq, <<"rabbitmq">>, Method),
         api_ref(emqx_bridge_kinesis, <<"kinesis_producer">>, Method ++ "_producer"),
         api_ref(emqx_bridge_kinesis, <<"kinesis_producer">>, Method ++ "_producer"),
-        api_ref(emqx_bridge_greptimedb, <<"greptimedb_grpc_v1">>, Method ++ "_grpc_v1")
+        api_ref(emqx_bridge_greptimedb, <<"greptimedb">>, Method ++ "_grpc_v1")
     ].
     ].
 
 
 schema_modules() ->
 schema_modules() ->
@@ -124,7 +124,7 @@ resource_type(oracle) -> emqx_oracle;
 resource_type(iotdb) -> emqx_bridge_iotdb_impl;
 resource_type(iotdb) -> emqx_bridge_iotdb_impl;
 resource_type(rabbitmq) -> emqx_bridge_rabbitmq_connector;
 resource_type(rabbitmq) -> emqx_bridge_rabbitmq_connector;
 resource_type(kinesis_producer) -> emqx_bridge_kinesis_impl_producer;
 resource_type(kinesis_producer) -> emqx_bridge_kinesis_impl_producer;
-resource_type(greptimedb_grpc_v1) -> emqx_bridge_greptimedb_connector.
+resource_type(greptimedb) -> emqx_bridge_greptimedb_connector.
 
 
 fields(bridges) ->
 fields(bridges) ->
     [
     [
@@ -302,7 +302,7 @@ greptimedb_structs() ->
                 }
                 }
             )}
             )}
      || Protocol <- [
      || Protocol <- [
-            greptimedb_grpc_v1
+            greptimedb
         ]
         ]
     ].
     ].
 
 

+ 10 - 10
apps/emqx_bridge_greptimedb/src/emqx_bridge_greptimedb.erl

@@ -32,16 +32,16 @@
 conn_bridge_examples(Method) ->
 conn_bridge_examples(Method) ->
     [
     [
         #{
         #{
-            <<"greptimedb_grpc_v1">> => #{
+            <<"greptimedb">> => #{
                 summary => <<"Greptimedb HTTP API V2 Bridge">>,
                 summary => <<"Greptimedb HTTP API V2 Bridge">>,
-                value => values("greptimedb_grpc_v1", Method)
+                value => values("greptimedb", Method)
             }
             }
         }
         }
     ].
     ].
 
 
 values(Protocol, get) ->
 values(Protocol, get) ->
     values(Protocol, post);
     values(Protocol, post);
-values("greptimedb_grpc_v1", post) ->
+values("greptimedb", post) ->
     SupportUint = <<"uint_value=${payload.uint_key}u,">>,
     SupportUint = <<"uint_value=${payload.uint_key}u,">>,
     TypeOpts = #{
     TypeOpts = #{
         bucket => <<"example_bucket">>,
         bucket => <<"example_bucket">>,
@@ -49,7 +49,7 @@ values("greptimedb_grpc_v1", post) ->
         token => <<"example_token">>,
         token => <<"example_token">>,
         server => <<"127.0.0.1:4001">>
         server => <<"127.0.0.1:4001">>
     },
     },
-    values(common, "greptimedb_grpc_v1", SupportUint, TypeOpts);
+    values(common, "greptimedb", SupportUint, TypeOpts);
 values(Protocol, put) ->
 values(Protocol, put) ->
     values(Protocol, post).
     values(Protocol, post).
 
 
@@ -80,13 +80,13 @@ namespace() -> "bridge_greptimedb".
 roots() -> [].
 roots() -> [].
 
 
 fields("post_grpc_v1") ->
 fields("post_grpc_v1") ->
-    method_fields(post, greptimedb_grpc_v1);
+    method_fields(post, greptimedb);
 fields("put_grpc_v1") ->
 fields("put_grpc_v1") ->
-    method_fields(put, greptimedb_grpc_v1);
+    method_fields(put, greptimedb);
 fields("get_grpc_v1") ->
 fields("get_grpc_v1") ->
-    method_fields(get, greptimedb_grpc_v1);
+    method_fields(get, greptimedb);
 fields(Type) when
 fields(Type) when
-    Type == greptimedb_grpc_v1
+    Type == greptimedb
 ->
 ->
     greptimedb_bridge_common_fields() ++
     greptimedb_bridge_common_fields() ++
         connector_fields(Type).
         connector_fields(Type).
@@ -125,8 +125,8 @@ desc("config") ->
     ?DESC("desc_config");
     ?DESC("desc_config");
 desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
 desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
     ["Configuration for Greptimedb using `", string:to_upper(Method), "` method."];
     ["Configuration for Greptimedb using `", string:to_upper(Method), "` method."];
-desc(greptimedb_grpc_v1) ->
-    ?DESC(emqx_bridge_greptimedb_connector, "greptimedb_grpc_v1");
+desc(greptimedb) ->
+    ?DESC(emqx_bridge_greptimedb_connector, "greptimedb");
 desc(_) ->
 desc(_) ->
     undefined.
     undefined.
 
 

+ 5 - 5
apps/emqx_bridge_greptimedb/src/emqx_bridge_greptimedb_connector.erl

@@ -119,7 +119,7 @@ roots() ->
         {config, #{
         {config, #{
             type => hoconsc:union(
             type => hoconsc:union(
                 [
                 [
-                    hoconsc:ref(?MODULE, greptimedb_grpc_v1)
+                    hoconsc:ref(?MODULE, greptimedb)
                 ]
                 ]
             )
             )
         }}
         }}
@@ -134,7 +134,7 @@ fields(common) ->
                 required => false, default => ms, desc => ?DESC("precision")
                 required => false, default => ms, desc => ?DESC("precision")
             })}
             })}
     ];
     ];
-fields(greptimedb_grpc_v1) ->
+fields(greptimedb) ->
     fields(common) ++
     fields(common) ++
         [
         [
             {dbname, mk(binary(), #{required => true, desc => ?DESC("dbname")})},
             {dbname, mk(binary(), #{required => true, desc => ?DESC("dbname")})},
@@ -159,8 +159,8 @@ server() ->
 
 
 desc(common) ->
 desc(common) ->
     ?DESC("common");
     ?DESC("common");
-desc(greptimedb_grpc_v1) ->
-    ?DESC("greptimedb_grpc_v1").
+desc(greptimedb) ->
+    ?DESC("greptimedb").
 
 
 %% -------------------------------------------------------------------------------------------------
 %% -------------------------------------------------------------------------------------------------
 %% internal functions
 %% internal functions
@@ -613,7 +613,7 @@ desc_test_() ->
         ),
         ),
         ?_assertMatch(
         ?_assertMatch(
             {desc, _, _},
             {desc, _, _},
-            desc(greptimedb_grpc_v1)
+            desc(greptimedb)
         ),
         ),
         ?_assertMatch(
         ?_assertMatch(
             {desc, _, _},
             {desc, _, _},

+ 5 - 5
apps/emqx_bridge_greptimedb/test/emqx_bridge_greptimedb_SUITE.erl

@@ -191,7 +191,7 @@ greptimedb_config(grpcv1 = Type, GreptimedbHost, GreptimedbPort, Config) ->
     WriteSyntax = example_write_syntax(),
     WriteSyntax = example_write_syntax(),
     ConfigString =
     ConfigString =
         io_lib:format(
         io_lib:format(
-            "bridges.greptimedb_grpc_v1.~s {\n"
+            "bridges.greptimedb.~s {\n"
             "  enable = true\n"
             "  enable = true\n"
             "  server = \"~p:~b\"\n"
             "  server = \"~p:~b\"\n"
             "  dbname = public\n"
             "  dbname = public\n"
@@ -229,7 +229,7 @@ parse_and_check(ConfigString, Type, Name) ->
     Config.
     Config.
 
 
 greptimedb_type_bin(grpcv1) ->
 greptimedb_type_bin(grpcv1) ->
-    <<"greptimedb_grpc_v1">>.
+    <<"greptimedb">>.
 
 
 create_bridge(Config) ->
 create_bridge(Config) ->
     create_bridge(Config, _Overrides = #{}).
     create_bridge(Config, _Overrides = #{}).
@@ -487,7 +487,7 @@ t_start_ok_timestamp_write_syntax(Config) ->
     GreptimedbConfigString0 = ?config(greptimedb_config_string, Config),
     GreptimedbConfigString0 = ?config(greptimedb_config_string, Config),
     GreptimedbTypeCfg =
     GreptimedbTypeCfg =
         case GreptimedbType of
         case GreptimedbType of
-            grpcv1 -> "greptimedb_grpc_v1"
+            grpcv1 -> "greptimedb"
         end,
         end,
     WriteSyntax =
     WriteSyntax =
         %% N.B.: this single space characters are relevant
         %% N.B.: this single space characters are relevant
@@ -521,7 +521,7 @@ t_start_ok_no_subject_tags_write_syntax(Config) ->
     GreptimedbConfigString0 = ?config(greptimedb_config_string, Config),
     GreptimedbConfigString0 = ?config(greptimedb_config_string, Config),
     GreptimedbTypeCfg =
     GreptimedbTypeCfg =
         case GreptimedbType of
         case GreptimedbType of
-            grpcv1 -> "greptimedb_grpc_v1"
+            grpcv1 -> "greptimedb"
         end,
         end,
     WriteSyntax =
     WriteSyntax =
         %% N.B.: this single space characters are relevant
         %% N.B.: this single space characters are relevant
@@ -641,7 +641,7 @@ t_bad_timestamp(Config) ->
     GreptimedbConfigString0 = ?config(greptimedb_config_string, Config),
     GreptimedbConfigString0 = ?config(greptimedb_config_string, Config),
     GreptimedbTypeCfg =
     GreptimedbTypeCfg =
         case GreptimedbType of
         case GreptimedbType of
-            grpcv1 -> "greptimedb_grpc_v1"
+            grpcv1 -> "greptimedb"
         end,
         end,
     WriteSyntax =
     WriteSyntax =
         %% N.B.: this single space characters are relevant
         %% N.B.: this single space characters are relevant

+ 2 - 2
rel/i18n/emqx_bridge_greptimedb_connector.hocon

@@ -6,10 +6,10 @@ dbname.desc:
 dbname.label:
 dbname.label:
 """Database"""
 """Database"""
 
 
-greptimedb_grpc_v1.desc:
+greptimedb.desc:
 """GreptimeDB's protocol. Support GreptimeDB v1.8 and before."""
 """GreptimeDB's protocol. Support GreptimeDB v1.8 and before."""
 
 
-greptimedb_grpc_v1.label:
+greptimedb.label:
 """HTTP API Protocol"""
 """HTTP API Protocol"""
 
 
 password.desc:
 password.desc: