yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(mqtt_action): fix resource_opts schema

This commit is contained in:
Thales Macedo Garitezi 2023-12-19 19:00:47 -03:00
parent ab1b0dda67
commit 3597ee7c93
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_action_info.erl
View File

@ -88,7 +88,7 @@ bridge_v1_config_to_action_config_helper(
) -> ) ->
%% Transform the egress part to mqtt_publisher connector config %% Transform the egress part to mqtt_publisher connector config
SchemaFields = emqx_bridge_mqtt_pubsub_schema:fields("mqtt_publisher_action"), SchemaFields = emqx_bridge_mqtt_pubsub_schema:fields("mqtt_publisher_action"),
ResourceOptsSchemaFields = emqx_bridge_mqtt_pubsub_schema:fields("resource_opts"), ResourceOptsSchemaFields = emqx_bridge_mqtt_pubsub_schema:fields(action_resource_opts),
ConfigMap1 = general_action_conf_map_from_bridge_v1_config( ConfigMap1 = general_action_conf_map_from_bridge_v1_config(
Config, ConnectorName, SchemaFields, ResourceOptsSchemaFields Config, ConnectorName, SchemaFields, ResourceOptsSchemaFields
), ),
@ -113,7 +113,7 @@ bridge_v1_config_to_action_config_helper(
) -> ) ->
%% Transform the egress part to mqtt_publisher connector config %% Transform the egress part to mqtt_publisher connector config
SchemaFields = emqx_bridge_mqtt_pubsub_schema:fields("mqtt_subscriber_source"), SchemaFields = emqx_bridge_mqtt_pubsub_schema:fields("mqtt_subscriber_source"),
ResourceOptsSchemaFields = emqx_bridge_mqtt_pubsub_schema:fields("resource_opts"), ResourceOptsSchemaFields = emqx_bridge_mqtt_pubsub_schema:fields(action_resource_opts),
ConfigMap1 = general_action_conf_map_from_bridge_v1_config( ConfigMap1 = general_action_conf_map_from_bridge_v1_config(
Config, ConnectorName, SchemaFields, ResourceOptsSchemaFields Config, ConnectorName, SchemaFields, ResourceOptsSchemaFields
), ),

6
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_schema.erl
View File

@ -80,11 +80,11 @@ fields(ingress_parameters) ->
Fields0 = emqx_bridge_mqtt_connector_schema:fields("ingress"), Fields0 = emqx_bridge_mqtt_connector_schema:fields("ingress"),
Fields1 = proplists:delete(pool_size, Fields0), Fields1 = proplists:delete(pool_size, Fields0),
Fields1; Fields1;
fields("resource_opts") -> fields(action_resource_opts) ->
UnsupportedOpts = [enable_batch, batch_size, batch_time], UnsupportedOpts = [enable_batch, batch_size, batch_time],
lists:filter( lists:filter(
fun({K, _V}) -> not lists:member(K, UnsupportedOpts) end, fun({K, _V}) -> not lists:member(K, UnsupportedOpts) end,
emqx_resource_schema:fields("creation_opts") emqx_bridge_v2_schema:resource_opts_fields()
); );
fields("get_connector") -> fields("get_connector") ->
emqx_bridge_mqtt_connector_schema:fields("config_connector"); emqx_bridge_mqtt_connector_schema:fields("config_connector");
@ -105,7 +105,7 @@ fields(What) ->
desc("config") -> desc("config") ->
?DESC("desc_config"); ?DESC("desc_config");
desc("resource_opts") -> desc(action_resource_opts) ->
?DESC(emqx_resource_schema, "creation_opts"); ?DESC(emqx_resource_schema, "creation_opts");
desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" -> desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
["Configuration for WebHook using `", string:to_upper(Method), "` method."]; ["Configuration for WebHook using `", string:to_upper(Method), "` method."];