yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: bump hocon to 0.39.10 

Which comes with a fix for slightly more user-friendly validation error
messages.
This commit is contained in:
Andrew Mayorov 2023-06-21 19:19:33 +02:00
parent 7382c6e6e1
commit 86d787eced
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/rebar.config
View File

@ -29,7 +29,7 @@
{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}}, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
{ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.2"}}}, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.2"}}},
{gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
{hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.9"}}}, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.10"}}},
{emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
{pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
{recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}, {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},

2
apps/emqx/test/emqx_schema_tests.erl
View File

@ -108,7 +108,7 @@ ssl_opts_version_gap_test_() ->
ssl_opts_cert_depth_test() -> ssl_opts_cert_depth_test() ->
Sc = emqx_schema:server_ssl_opts_schema(#{}, false), Sc = emqx_schema:server_ssl_opts_schema(#{}, false),
Reason = #{expected_type => "non_neg_integer()"}, Reason = #{expected => "non_neg_integer()"},
?assertThrow( ?assertThrow(
{_Sc, [#{kind := validation_error, reason := Reason}]}, {_Sc, [#{kind := validation_error, reason := Reason}]},
validate(Sc, #{<<"depth">> => -1}) validate(Sc, #{<<"depth">> => -1})

2
apps/emqx_conf/test/emqx_conf_schema_tests.erl
View File

@ -236,7 +236,7 @@ log_rotation_count_limit_test() ->
mismatches := #{"handler_name" := mismatches := #{"handler_name" :=
#{kind := validation_error, #{kind := validation_error,
path := "log.file.default.rotation_count", path := "log.file.default.rotation_count",
reason := #{expected_type := "1..128"}, reason := #{expected := "1..128"},
value := Count} value := Count}
}}]}, }}]},
hocon_tconf:generate(emqx_conf_schema, ConfMap0)) hocon_tconf:generate(emqx_conf_schema, ConfMap0))

2
apps/emqx_resource/test/emqx_resource_schema_tests.erl
View File

@ -97,7 +97,7 @@ worker_pool_size_test_() ->
{_, [ {_, [
#{ #{
kind := validation_error, kind := validation_error,
reason := #{expected_type := _}, reason := #{expected := _},
value := WorkerPoolSize value := WorkerPoolSize
} }
]}, ]},

2
lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl
View File

@ -109,7 +109,7 @@ t_avro_invalid_json_schema(_Config) ->
Params = schema_params(avro), Params = schema_params(avro),
WrongParams = Params#{source := <<"{">>}, WrongParams = Params#{source := <<"{">>},
?assertMatch( ?assertMatch(
{error, #{reason := #{expected_type := _}}}, {error, #{reason := #{expected := _}}},
emqx_ee_schema_registry:add_schema(SerdeName, WrongParams) emqx_ee_schema_registry:add_schema(SerdeName, WrongParams)
), ),
ok. ok.

2
mix.exs
View File

@ -72,7 +72,7 @@ defmodule EMQXUmbrella.MixProject do
# in conflict by emqtt and hocon # in conflict by emqtt and hocon
{:getopt, "1.0.2", override: true}, {:getopt, "1.0.2", override: true},
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.8", override: true}, {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.8", override: true},
{:hocon, github: "emqx/hocon", tag: "0.39.9", override: true}, {:hocon, github: "emqx/hocon", tag: "0.39.10", override: true},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.2", override: true}, {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.2", override: true},
{:esasl, github: "emqx/esasl", tag: "0.2.0"}, {:esasl, github: "emqx/esasl", tag: "0.2.0"},
{:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"}, {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},

2
rebar.config
View File

@ -75,7 +75,7 @@
, {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}} , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}
, {getopt, "1.0.2"} , {getopt, "1.0.2"}
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.8"}}} , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.8"}}}
, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.9"}}} , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.10"}}}
, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}} , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}
, {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}} , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}} , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}