fix(include_dirs): Don't truncation include_dirs dir path name.

emqx · Dec 28, 2021 · 7d03687 · 7d03687
1 parent b6baf9c
commit 7d03687
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/hocon.erl b/src/hocon.erl
@@ -48,7 +48,7 @@ load(Filename0) ->
 -spec(load(file:filename(), opts()) -> {ok, config()} | {error, term()}).
 load(Filename0, Opts) ->
     Filename = hocon_util:real_file_name(filename:absname(Filename0)),
-    IncludeDirs = [filename:dirname(Dir) || Dir <- maps:get(include_dirs, Opts, [])],
+    IncludeDirs = maps:get(include_dirs, Opts, []),
     CtxList = [{path, '$root'}, {filename, Filename}, {include_dirs, IncludeDirs}],
     Ctx = hocon_util:stack_multiple_push(CtxList, #{}),
     try
@@ -93,7 +93,7 @@ binary(Binary) ->
 
 binary(Binary, Opts) ->
     try
-        IncludeDirs = [filename:dirname(Dir)  || Dir <-maps:get(include_dirs, Opts, [])],
+        IncludeDirs = maps:get(include_dirs, Opts, []),
         CtxList = [{path, '$root'}, {filename, undefined}, {include_dirs, IncludeDirs}],
         Ctx = hocon_util:stack_multiple_push(CtxList, #{}),
         Map = transform(do_binary(Binary, Ctx), Opts),

diff --git a/test/hocon_tests.erl b/test/hocon_tests.erl
@@ -330,9 +330,12 @@ include_dirs_test() ->
         #{<<"cookie">> => <<"emqxsecretcookie">>,
           <<"data_dir">> => <<"platform_data_dir">>,
           <<"name">> => <<"[email protected]">>}},
-  Opts = #{include_dirs => ["test/data/", "sample-configs/"]},
-  {ok, Map} = hocon:load("etc/include-dir.conf", Opts),
+  Opts = #{include_dirs => ["test/data", "sample-configs/", "etc/"]},
+  Filename = "etc/include-dir.conf",
+  {ok, Map} = hocon:load(Filename, Opts),
   ?assertEqual(Expect, Map),
+  {ok, Map2} = hocon:binary(hocon_token:read(Filename), Opts),
+  ?assertEqual(Expect, Map2),
   {error, Reason} = hocon:load("etc/include-dir-enoent.conf", Opts),
   ?assertEqual({enoent, <<"not-exist.conf">>}, Reason),
   ok.