From 5838568d5deadd8acb47d4f0ace36aad6ffef6df Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Mon, 13 Nov 2023 11:41:40 +0100
Subject: [PATCH] fix: hard coded call to schema module

The user can configure the configuration loader and schema module so we
should not hard code a call to the default schema module.
---
 apps/emqx/src/emqx_config_handler.erl | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/emqx/src/emqx_config_handler.erl b/apps/emqx/src/emqx_config_handler.erl
index cf1fb2b8d..ad97583a0 100644
--- a/apps/emqx/src/emqx_config_handler.erl
+++ b/apps/emqx/src/emqx_config_handler.erl
@@ -662,7 +662,7 @@ remove_from_override_config(_BinKeyPath, #{persistent := false}) ->
     undefined;
 remove_from_override_config(BinKeyPath, Opts) ->
     OldConf = emqx_config:read_override_conf(Opts),
-    UpgradedOldConf = emqx_conf_schema:upgrade_raw_conf(OldConf),
+    UpgradedOldConf = upgrade_conf(OldConf),
     emqx_utils_maps:deep_remove(BinKeyPath, UpgradedOldConf).
 
 %% apply new config on top of override config
@@ -670,9 +670,25 @@ merge_to_override_config(_RawConf, #{persistent := false}) ->
     undefined;
 merge_to_override_config(RawConf, Opts) ->
     OldConf = emqx_config:read_override_conf(Opts),
-    UpgradedOldConf = emqx_conf_schema:upgrade_raw_conf(OldConf),
+    UpgradedOldConf = upgrade_conf(OldConf),
     maps:merge(UpgradedOldConf, RawConf).
 
+upgrade_conf(Conf) ->
+    try
+        ConfLoader = emqx_app:get_config_loader(),
+        SchemaModule = apply(ConfLoader, schema_module, []),
+        apply(SchemaModule, upgrade_raw_conf, [Conf])
+    catch
+        ErrorType:Reason:Stack ->
+            ?SLOG(warning, #{
+                msg => "Failed to upgrade override config",
+                error_type => ErrorType,
+                reason => Reason,
+                stacktrace => Stack
+            }),
+            Conf
+    end.
+
 up_req({remove, _Opts}) -> '$remove';
 up_req({{update, Req}, _Opts}) -> Req.