Skip to content

Commit

Permalink
Merge pull request #211 from emqx/remove-env-meta-from-array
Browse files Browse the repository at this point in the history
Remove env meta from array
  • Loading branch information
zhongwencool authored Nov 28, 2022
2 parents 900ce56 + abeb693 commit 8dc0b2e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/hocon_tconf.erl
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@ remove_env_meta(Map) when is_map(Map) ->
remove_env_meta(maps:iterator(Map), #{});
remove_env_meta(Array) when is_list(Array) ->
[remove_env_meta(R) || R <- Array];
remove_env_meta(?FROM_ENV_VAR(_Env, Val)) ->
Val;
remove_env_meta(Value) ->
Value.

Expand Down
4 changes: 4 additions & 0 deletions test/hocon_tconf_tests.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1777,6 +1777,10 @@ make_keys_test() ->
#{<<"k1">> => ?FROM_ENV_VAR("V1", <<"v1">>)},
#{<<"k1">> => <<"v1">>}
},
{
#{<<"k1">> => [?FROM_ENV_VAR("V1", <<"v1">>)]},
#{<<"k1">> => [<<"v1">>]}
},
{
#{<<"k1">> => #{<<"k2">> => <<"v1">>}},
#{<<"k1">> => #{<<"k2">> => <<"v1">>}}
Expand Down

0 comments on commit 8dc0b2e

Please sign in to comment.