fix: address more comments from @thalesmg

apps/emqx_bridge/src/emqx_action_info.erl

@@ -77,11 +77,11 @@ hard_coded_action_info_modules_ee() ->
         emqx_bridge_confluent_producer_action_info,
         emqx_bridge_gcp_pubsub_producer_action_info,
         emqx_bridge_kafka_action_info,
+        emqx_bridge_matrix_action_info,
         emqx_bridge_mongodb_action_info,
-        emqx_bridge_syskeeper_action_info,
         emqx_bridge_pgsql_action_info,
-        emqx_bridge_timescale_action_info,
+        emqx_bridge_syskeeper_action_info,
-        emqx_bridge_matrix_action_info
+        emqx_bridge_timescale_action_info
     ].
 -else.
 hard_coded_action_info_modules_ee() ->

apps/emqx_bridge_pgsql/src/emqx_bridge_pgsql.erl

@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
 -module(emqx_bridge_pgsql).
@@ -68,7 +68,6 @@ fields(action_parameters) ->
         emqx_connector_schema_lib:prepare_statement_fields();
 fields(pgsql_action) ->
     emqx_bridge_v2_schema:make_producer_action_schema(hoconsc:ref(?MODULE, action_parameters));
-%% TODO: All of these needs to be fixed
 fields("put_bridge_v2") ->
     fields(pgsql_action);
 fields("get_bridge_v2") ->

apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl

@@ -29,18 +29,18 @@ resource_type(gcp_pubsub_producer) ->
     emqx_bridge_gcp_pubsub_impl_producer;
 resource_type(kafka_producer) ->
     emqx_bridge_kafka_impl_producer;
+resource_type(matrix) ->
+    emqx_postgresql;
 resource_type(mongodb) ->
     emqx_bridge_mongodb_connector;
+resource_type(pgsql) ->
+    emqx_postgresql;
 resource_type(syskeeper_forwarder) ->
     emqx_bridge_syskeeper_connector;
 resource_type(syskeeper_proxy) ->
     emqx_bridge_syskeeper_proxy_server;
-resource_type(pgsql) ->
-    emqx_postgresql;
 resource_type(timescale) ->
     emqx_postgresql;
-resource_type(matrix) ->
-    emqx_postgresql;
 resource_type(Type) ->
     error({unknown_connector_type, Type}).
 
@@ -159,12 +159,12 @@ schema_modules() ->
         emqx_bridge_confluent_producer,
         emqx_bridge_gcp_pubsub_producer_schema,
         emqx_bridge_kafka,
+        emqx_bridge_matrix,
         emqx_bridge_mongodb,
         emqx_bridge_syskeeper_connector,
         emqx_bridge_syskeeper_proxy,
-        emqx_postgresql_connector_schema,
         emqx_bridge_timescale,
-        emqx_bridge_matrix
+        emqx_postgresql_connector_schema
     ].
 
 api_schemas(Method) ->
@@ -183,12 +183,12 @@ api_schemas(Method) ->
             Method ++ "_connector"
         ),
         api_ref(emqx_bridge_kafka, <<"kafka_producer">>, Method ++ "_connector"),
+        api_ref(emqx_bridge_matrix, <<"matrix">>, Method ++ "_connector"),
         api_ref(emqx_bridge_mongodb, <<"mongodb">>, Method ++ "_connector"),
         api_ref(emqx_bridge_syskeeper_connector, <<"syskeeper_forwarder">>, Method),
         api_ref(emqx_bridge_syskeeper_proxy, <<"syskeeper_proxy">>, Method),
-        api_ref(emqx_postgresql_connector_schema, <<"pgsql">>, Method ++ "_connector"),
         api_ref(emqx_bridge_timescale, <<"timescale">>, Method ++ "_connector"),
-        api_ref(emqx_bridge_matrix, <<"matrix">>, Method ++ "_connector")
+        api_ref(emqx_postgresql_connector_schema, <<"pgsql">>, Method ++ "_connector")
     ].
 
 api_ref(Module, Type, Method) ->

apps/emqx_connector/src/schema/emqx_connector_schema.erl

@@ -70,12 +70,12 @@ connector_type_to_bridge_types(azure_event_hub_producer) -> [azure_event_hub_pro
 connector_type_to_bridge_types(confluent_producer) -> [confluent_producer];
 connector_type_to_bridge_types(gcp_pubsub_producer) -> [gcp_pubsub, gcp_pubsub_producer];
 connector_type_to_bridge_types(kafka_producer) -> [kafka, kafka_producer];
+connector_type_to_bridge_types(matrix) -> [matrix];
 connector_type_to_bridge_types(mongodb) -> [mongodb, mongodb_rs, mongodb_sharded, mongodb_single];
+connector_type_to_bridge_types(pgsql) -> [pgsql];
 connector_type_to_bridge_types(syskeeper_forwarder) -> [syskeeper_forwarder];
 connector_type_to_bridge_types(syskeeper_proxy) -> [];
-connector_type_to_bridge_types(pgsql) -> [pgsql];
+connector_type_to_bridge_types(timescale) -> [timescale].
-connector_type_to_bridge_types(timescale) -> [timescale];
-connector_type_to_bridge_types(matrix) -> [matrix].
 
 actions_config_name() -> <<"actions">>.
 

apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl

@@ -43,12 +43,7 @@ fields("connection_fields") ->
         adjust_fields(emqx_connector_schema_lib:relational_db_fields()) ++
         emqx_connector_schema_lib:ssl_fields();
 fields("config_connector") ->
-    fields("connection_fields") ++ fields(enable_and_desc);
+    fields("connection_fields") ++ emqx_connector_schema:common_fields();
-fields(enable_and_desc) ->
-    [
-        {enable, hoconsc:mk(boolean(), #{desc => ?DESC("config_enable"), default => true})},
-        {description, emqx_schema:description_schema()}
-    ];
 fields(config) ->
     fields("config_connector") ++
         fields(action);

rel/i18n/emqx_postgresql_connector_schema.hocon

@@ -15,10 +15,4 @@ config_connector.desc:
 config_connector.label:
 """PostgreSQL Connector Config"""
 
-config_enable.desc:
-"""Enable (true) or disable (false) this PostgreSQL bridge."""
-
-config_enable.label:
-"""Enable or Disable"""
-
 }