From 808237364cad717d1c42d2028a25fc10db750b1d Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 9 Oct 2023 09:58:20 +0200
Subject: [PATCH 1/3] fix(api-docs): add file-transfer config to hot-config
 scope

---
 apps/emqx_management/src/emqx_management.app.src   | 2 +-
 apps/emqx_management/src/emqx_mgmt_api_configs.erl | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
index 1a37ce2ea..3c13a1935 100644
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@@ -2,7 +2,7 @@
 {application, emqx_management, [
     {description, "EMQX Management API and CLI"},
     % strict semver, bump manually!
-    {vsn, "5.0.31"},
+    {vsn, "5.0.32"},
     {modules, []},
     {registered, [emqx_management_sup]},
     {applications, [kernel, stdlib, emqx_plugins, minirest, emqx, emqx_ctl, emqx_bridge_http]},
diff --git a/apps/emqx_management/src/emqx_mgmt_api_configs.erl b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
index 29afa9d09..d5879be36 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_configs.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
@@ -38,12 +38,21 @@
 -define(OPTS, #{rawconf_with_defaults => true, override_to => cluster}).
 -define(TAGS, ["Configs"]).
 
+-if(?EMQX_RELEASE_EDITION == ee).
+-define(ROOT_KEYS_EE, [
+    <<"file_transfer">>
+]).
+-else.
+-define(ROOT_KEYS_EE, []).
+-endif.
+
 -define(ROOT_KEYS, [
     <<"dashboard">>,
     <<"alarm">>,
     <<"sys_topics">>,
     <<"sysmon">>,
     <<"log">>
+    | ?ROOT_KEYS_EE
 ]).
 
 %% erlfmt-ignore

From 2b44349b21323f810d21ef7b44e7afa5fa0862e6 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 9 Oct 2023 10:00:24 +0200
Subject: [PATCH 2/3] docs: add changelog for pull request 11731

---
 changes/ee/fix-11731.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ee/fix-11731.en.md

diff --git a/changes/ee/fix-11731.en.md b/changes/ee/fix-11731.en.md
new file mode 100644
index 000000000..5584da337
--- /dev/null
+++ b/changes/ee/fix-11731.en.md
@@ -0,0 +1 @@
+Add file_transfer feature configs to hot-config schema.

From 2626d793a71ecb6b27ec722c7446cb674b1bb56f Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 9 Oct 2023 12:40:30 +0200
Subject: [PATCH 3/3] test: try to resolve schema module from PROFILE in tests

---
 apps/emqx_conf/src/emqx_conf.erl | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl
index 1efeb4d69..f9e64ffa6 100644
--- a/apps/emqx_conf/src/emqx_conf.erl
+++ b/apps/emqx_conf/src/emqx_conf.erl
@@ -203,14 +203,30 @@ gen_config_md(Dir, SchemaModule, Lang) ->
 -spec schema_module() -> module().
 schema_module() ->
     case os:getenv("SCHEMA_MOD") of
-        false -> emqx_conf_schema;
-        Value -> list_to_existing_atom(Value)
+        false ->
+            resolve_schema_module();
+        Value ->
+            list_to_existing_atom(Value)
     end.
 
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------
 
+-ifdef(TEST).
+resolve_schema_module() ->
+    case os:getenv("PROFILE") of
+        "emqx" ->
+            emqx_conf_schema;
+        "emqx-enterprise" ->
+            emqx_enterprise_schema
+    end.
+-else.
+-spec resolve_schema_module() -> no_return().
+resolve_schema_module() ->
+    error("SCHEMA_MOD environment variable is not set").
+-endif.
+
 %% @doc Make a resolver function that can be used to lookup the description by hocon_schema_json dump.
 make_desc_resolver(Lang) ->
     fun