diff --git a/apps/emqx_connector/src/emqx_connector_http.erl b/apps/emqx_connector/src/emqx_connector_http.erl index 77d498c6b..509e293cf 100644 --- a/apps/emqx_connector/src/emqx_connector_http.erl +++ b/apps/emqx_connector/src/emqx_connector_http.erl @@ -112,7 +112,7 @@ If the request is provided, the caller can send HTTP requests via emqx_resource:query(ResourceId, {send_message, BridgeId, Message}) """ })} - ] ++ emqx_connector_schema:common_fields() ++ emqx_connector_schema_lib:ssl_fields(); + ] ++ emqx_connector_schema_lib:ssl_fields(); fields("request") -> [ {method, hoconsc:mk(hoconsc:enum([post, put, get, delete]), #{nullable => true})} diff --git a/apps/emqx_connector/src/emqx_connector_schema.erl b/apps/emqx_connector/src/emqx_connector_schema.erl index ed663ee60..33d10802b 100644 --- a/apps/emqx_connector/src/emqx_connector_schema.erl +++ b/apps/emqx_connector/src/emqx_connector_schema.erl @@ -8,8 +8,6 @@ -export([roots/0, fields/1]). --export([common_fields/0]). - -export([ get_response/0 , put_request/0 , post_request/0 @@ -51,10 +49,3 @@ fields("connectors") -> schema_mod(Type) -> list_to_atom(lists:concat(["emqx_connector_", Type])). - -common_fields() -> - [ {name, - mk(binary(), - #{ desc => "Connector name, used as a human-readable description of the connector." - })} - ]. diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl index 44add053c..b3484f5d9 100644 --- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl +++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl @@ -55,6 +55,11 @@ clientid conflicts between different nodes. And we can only use shared subscript topic filters for 'remote_topic' of ingress connections. """ })} + , {name, + sc(binary(), + #{ nullable => true + , desc => "Connector name, used as a human-readable description of the connector." + })} , {server, sc(emqx_schema:ip_port(), #{ default => "127.0.0.1:1883" @@ -94,7 +99,7 @@ topic filters for 'remote_topic' of ingress connections. Queue messages in disk files. """ })} - ] ++ emqx_connector_schema:common_fields() ++ emqx_connector_schema_lib:ssl_fields(); + ] ++ emqx_connector_schema_lib:ssl_fields(); fields("ingress") -> %% the message maybe subscribed by rules, in this case 'local_topic' is not necessary diff --git a/apps/emqx_resource/src/emqx_resource_instance.erl b/apps/emqx_resource/src/emqx_resource_instance.erl index ebc812805..c23d55511 100644 --- a/apps/emqx_resource/src/emqx_resource_instance.erl +++ b/apps/emqx_resource/src/emqx_resource_instance.erl @@ -217,7 +217,7 @@ do_restart(InstId) -> case lookup(InstId) of {ok, #{mod := Mod, state := ResourceState, config := Config} = Data} -> _ = case ResourceState of - undefine -> ok; + undefined -> ok; _ -> emqx_resource:call_stop(InstId, Mod, ResourceState) end, case emqx_resource:call_start(InstId, Mod, Config) of