diff --git a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl index 3080a7a9e..a9705585d 100644 --- a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl +++ b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl @@ -281,7 +281,7 @@ on_stop(InstId, _State) -> Res. on_remove_channel( - InstId, + _InstId, OldState = #{installed_actions := InstalledActions}, ActionId ) -> @@ -646,7 +646,7 @@ process_request_and_action(Request, ActionState, Msg) -> ), HeadersTemplate1 = maps:get(headers, Request), - HeadersTemplate2= maps:get(headers, ActionState), + HeadersTemplate2 = maps:get(headers, ActionState), Headers = merge_proplist( render_headers(HeadersTemplate1, Msg), render_headers(HeadersTemplate2, Msg) diff --git a/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl b/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl index afe734105..4875cfdc9 100644 --- a/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl +++ b/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl @@ -123,7 +123,7 @@ fields("config_connector") -> default => true } )} - ] ++ connector_opts_1() ++ connector_opts_0(); + ] ++ connector_url_headers() ++ connector_opts(); %%-------------------------------------------------------------------- %% v1/v2 fields("resource_opts") -> @@ -155,7 +155,7 @@ basic_config() -> default => true } )} - ] ++ webhook_resource_opts() ++ connector_opts_0(). + ] ++ webhook_resource_opts() ++ connector_opts(). request_config() -> [ @@ -202,7 +202,7 @@ request_config() -> %%-------------------------------------------------------------------- %% helpers for v2 only -connector_opts_1() -> +connector_url_headers() -> [url_field(), headers_field()]. %%-------------------------------------------------------------------- @@ -287,7 +287,7 @@ webhook_resource_opts() -> )} ]. -connector_opts_0() -> +connector_opts() -> mark_request_field_deperecated( proplists:delete(max_retries, emqx_bridge_http_connector:fields(config)) ).