Преглед изворни кода

fix(mqtt_action): fix resource_opts schema

Thales Macedo Garitezi пре 2 година
родитељ
комит
3597ee7c93

+ 2 - 2
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
     ),

+ 3 - 3
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."];