From 3597ee7c939dbe1db421cfb8f66f25a00425ab37 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 19 Dec 2023 19:00:47 -0300 Subject: [PATCH] fix(mqtt_action): fix resource_opts schema --- .../src/emqx_bridge_mqtt_pubsub_action_info.erl | 4 ++-- .../emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_schema.erl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_action_info.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_action_info.erl index de39fc9b4..8918a60be 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_action_info.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_action_info.erl @@ -88,7 +88,7 @@ bridge_v1_config_to_action_config_helper( ) -> %% Transform the egress part to mqtt_publisher connector config 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( Config, ConnectorName, SchemaFields, ResourceOptsSchemaFields ), @@ -113,7 +113,7 @@ bridge_v1_config_to_action_config_helper( ) -> %% Transform the egress part to mqtt_publisher connector config 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( Config, ConnectorName, SchemaFields, ResourceOptsSchemaFields ), diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_schema.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_schema.erl index 67dc52911..2cc13daaf 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_schema.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_pubsub_schema.erl @@ -80,11 +80,11 @@ fields(ingress_parameters) -> Fields0 = emqx_bridge_mqtt_connector_schema:fields("ingress"), Fields1 = proplists:delete(pool_size, Fields0), Fields1; -fields("resource_opts") -> +fields(action_resource_opts) -> UnsupportedOpts = [enable_batch, batch_size, batch_time], lists:filter( 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") -> emqx_bridge_mqtt_connector_schema:fields("config_connector"); @@ -105,7 +105,7 @@ fields(What) -> desc("config") -> ?DESC("desc_config"); -desc("resource_opts") -> +desc(action_resource_opts) -> ?DESC(emqx_resource_schema, "creation_opts"); desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" -> ["Configuration for WebHook using `", string:to_upper(Method), "` method."];