From 86d787eced6708bc5ea22bb3fb9434a9dd9cbdde Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Wed, 21 Jun 2023 19:19:33 +0200 Subject: [PATCH] chore: bump hocon to 0.39.10 Which comes with a fix for slightly more user-friendly validation error messages. --- apps/emqx/rebar.config | 2 +- apps/emqx/test/emqx_schema_tests.erl | 2 +- apps/emqx_conf/test/emqx_conf_schema_tests.erl | 2 +- apps/emqx_resource/test/emqx_resource_schema_tests.erl | 2 +- .../test/emqx_ee_schema_registry_serde_SUITE.erl | 2 +- mix.exs | 2 +- rebar.config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 6c76a55b7..815001e7c 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -29,7 +29,7 @@ {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}}, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.2"}}}, {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"}}}, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}, {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}, diff --git a/apps/emqx/test/emqx_schema_tests.erl b/apps/emqx/test/emqx_schema_tests.erl index 446c9e586..157bf42be 100644 --- a/apps/emqx/test/emqx_schema_tests.erl +++ b/apps/emqx/test/emqx_schema_tests.erl @@ -108,7 +108,7 @@ ssl_opts_version_gap_test_() -> ssl_opts_cert_depth_test() -> Sc = emqx_schema:server_ssl_opts_schema(#{}, false), - Reason = #{expected_type => "non_neg_integer()"}, + Reason = #{expected => "non_neg_integer()"}, ?assertThrow( {_Sc, [#{kind := validation_error, reason := Reason}]}, validate(Sc, #{<<"depth">> => -1}) diff --git a/apps/emqx_conf/test/emqx_conf_schema_tests.erl b/apps/emqx_conf/test/emqx_conf_schema_tests.erl index cdebfeaf7..76efd8ec4 100644 --- a/apps/emqx_conf/test/emqx_conf_schema_tests.erl +++ b/apps/emqx_conf/test/emqx_conf_schema_tests.erl @@ -236,7 +236,7 @@ log_rotation_count_limit_test() -> mismatches := #{"handler_name" := #{kind := validation_error, path := "log.file.default.rotation_count", - reason := #{expected_type := "1..128"}, + reason := #{expected := "1..128"}, value := Count} }}]}, hocon_tconf:generate(emqx_conf_schema, ConfMap0)) diff --git a/apps/emqx_resource/test/emqx_resource_schema_tests.erl b/apps/emqx_resource/test/emqx_resource_schema_tests.erl index 0935ee1c6..78a761bd2 100644 --- a/apps/emqx_resource/test/emqx_resource_schema_tests.erl +++ b/apps/emqx_resource/test/emqx_resource_schema_tests.erl @@ -97,7 +97,7 @@ worker_pool_size_test_() -> {_, [ #{ kind := validation_error, - reason := #{expected_type := _}, + reason := #{expected := _}, value := WorkerPoolSize } ]}, diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl index 1ab5e3c01..072d4bf3b 100644 --- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl +++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl @@ -109,7 +109,7 @@ t_avro_invalid_json_schema(_Config) -> Params = schema_params(avro), WrongParams = Params#{source := <<"{">>}, ?assertMatch( - {error, #{reason := #{expected_type := _}}}, + {error, #{reason := #{expected := _}}}, emqx_ee_schema_registry:add_schema(SerdeName, WrongParams) ), ok. diff --git a/mix.exs b/mix.exs index 776c32d71..f2b90c231 100644 --- a/mix.exs +++ b/mix.exs @@ -72,7 +72,7 @@ defmodule EMQXUmbrella.MixProject do # in conflict by emqtt and hocon {:getopt, "1.0.2", 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}, {:esasl, github: "emqx/esasl", tag: "0.2.0"}, {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"}, diff --git a/rebar.config b/rebar.config index bc392bb92..48d5a34bb 100644 --- a/rebar.config +++ b/rebar.config @@ -75,7 +75,7 @@ , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}} , {getopt, "1.0.2"} , {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"}}} , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}} , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}