From f7adaa891175a1f7bf5c7504c7aaa3dc58a21fe5 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Mon, 11 Dec 2023 15:03:20 -0300 Subject: [PATCH] fix(postgres_schema): fix usages of `resource_opts` in connector and action schemas Fixes https://emqx.atlassian.net/browse/EMQX-11569 --- apps/emqx_bridge/src/schema/emqx_bridge_v2_schema.erl | 2 +- .../src/schema/emqx_postgresql_connector_schema.erl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_v2_schema.erl b/apps/emqx_bridge/src/schema/emqx_bridge_v2_schema.erl index b271f4259..3a2be82f8 100644 --- a/apps/emqx_bridge/src/schema/emqx_bridge_v2_schema.erl +++ b/apps/emqx_bridge/src/schema/emqx_bridge_v2_schema.erl @@ -177,7 +177,7 @@ roots() -> fields(actions) -> registered_schema_fields(); fields(resource_opts) -> - emqx_resource_schema:create_opts(_Overrides = []). + resource_opts_fields(_Overrides = []). registered_schema_fields() -> [ diff --git a/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl b/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl index 304a7356c..b4e04e982 100644 --- a/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl +++ b/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl @@ -85,7 +85,10 @@ fields({Field, Type}) when Field == "put_connector"; Field == "post_connector" -> - emqx_connector_schema:api_fields(Field, Type, fields("connection_fields")). + Fields = + fields("connection_fields") ++ + emqx_connector_schema:resource_opts_ref(?MODULE, resource_opts), + emqx_connector_schema:api_fields(Field, Type, Fields). server() -> Meta = #{desc => ?DESC("server")},