From 5547a40ceb95d9be2537a173df2f44900b87ce2a Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Wed, 24 Jan 2024 11:39:14 -0300
Subject: [PATCH] fix(ds): don't use env var for data dir default value

Fixes https://github.com/emqx/emqx/pull/12380
---
 apps/emqx/src/emqx_persistent_message.erl | 4 ++--
 apps/emqx/src/emqx_schema.erl             | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/emqx/src/emqx_persistent_message.erl b/apps/emqx/src/emqx_persistent_message.erl
index d725c9b2c..8e3755fdb 100644
--- a/apps/emqx/src/emqx_persistent_message.erl
+++ b/apps/emqx/src/emqx_persistent_message.erl
@@ -61,13 +61,13 @@ force_ds() ->
     emqx_config:get([session_persistence, force_persistence]).
 
 storage_backend(#{
-    builtin := #{
+    builtin := Opts = #{
         enable := true,
-        data_dir := DataDir,
         n_shards := NShards,
         replication_factor := ReplicationFactor
     }
 }) ->
+    DataDir = maps:get(data_dir, Opts, emqx:data_dir()),
     #{
         backend => builtin,
         data_dir => DataDir,
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 56d575bd9..bbca13172 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -1896,11 +1896,8 @@ fields("session_storage_backend_builtin") ->
                 string(),
                 #{
                     desc => ?DESC(session_builtin_data_dir),
-                    default => <<"${EMQX_DATA_DIR}">>,
-                    importance => ?IMPORTANCE_LOW,
-                    converter => fun(Path, Opts) ->
-                        naive_env_interpolation(ensure_unicode_path(Path, Opts))
-                    end
+                    required => false,
+                    importance => ?IMPORTANCE_LOW
                 }
             )},
         {"n_shards",