From 352d818e3b14a64259287cda7e9a763d26569f96 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 4 Jul 2023 20:17:07 +0800 Subject: [PATCH 1/3] chore: update hocon to 0.39.13 --- apps/emqx/rebar.config | 2 +- changes/ce/fix-11077.en.md | 1 + mix.exs | 2 +- rebar.config | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changes/ce/fix-11077.en.md diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 0278a1b1d..78a8b76e0 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.5"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}, - {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.11"}}}, + {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.13"}}}, {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/changes/ce/fix-11077.en.md b/changes/ce/fix-11077.en.md new file mode 100644 index 000000000..64911df4a --- /dev/null +++ b/changes/ce/fix-11077.en.md @@ -0,0 +1 @@ +Fixes crash when updating binding with a non-integer port. diff --git a/mix.exs b/mix.exs index 9e9279895..65c942394 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.11", override: true}, + {:hocon, github: "emqx/hocon", tag: "0.39.13", 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 ff55d2e70..0f6864c5e 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.11"}}} + , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.13"}}} , {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"}}} From 7039dca51c7eac9ec5fbffa9ef5d5c0a1edf59bc Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 4 Jul 2023 20:25:59 +0800 Subject: [PATCH 2/3] chore: add 11192 changelog --- changes/ce/fix-11192.en.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changes/ce/fix-11192.en.md diff --git a/changes/ce/fix-11192.en.md b/changes/ce/fix-11192.en.md new file mode 100644 index 000000000..6bbc0b12d --- /dev/null +++ b/changes/ce/fix-11192.en.md @@ -0,0 +1,2 @@ +Fix produces valid HOCON file when atom type is used. +Remove unnecessary `"` from HOCON file. From b5cc8fb3c3abddba651fbc218750b056ee526cbc Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Fri, 7 Jul 2023 16:38:40 +0800 Subject: [PATCH 3/3] fix: start_after_created's default value --- apps/emqx_authz/test/emqx_authz_test_lib.erl | 2 +- .../emqx-export-test-bootstrap-ce.tar.gz | Bin 11822 -> 11973 bytes apps/emqx_resource/include/emqx_resource.hrl | 1 - apps/emqx_resource/src/emqx_resource.app.src | 2 +- .../src/schema/emqx_resource_schema.erl | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/emqx_authz/test/emqx_authz_test_lib.erl b/apps/emqx_authz/test/emqx_authz_test_lib.erl index e308e0de7..03d687851 100644 --- a/apps/emqx_authz/test/emqx_authz_test_lib.erl +++ b/apps/emqx_authz/test/emqx_authz_test_lib.erl @@ -35,7 +35,7 @@ reset_authorizers(Nomatch, CacheEnabled, Source) -> [authorization], #{ <<"no_match">> => atom_to_binary(Nomatch), - <<"cache">> => #{<<"enable">> => atom_to_binary(CacheEnabled)}, + <<"cache">> => #{<<"enable">> => CacheEnabled}, <<"sources">> => Source } ), diff --git a/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE_data/emqx-export-test-bootstrap-ce.tar.gz b/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE_data/emqx-export-test-bootstrap-ce.tar.gz index b7da76bbb0a8b1037f64e21304a4376f21ff08ab..a22ff40a5708e515ac1d61fd61102980dc443aa6 100644 GIT binary patch literal 11973 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 diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl index 41e5673d9..10dc001c2 100644 --- a/apps/emqx_resource/include/emqx_resource.hrl +++ b/apps/emqx_resource/include/emqx_resource.hrl @@ -114,7 +114,6 @@ %% boolean -define(START_AFTER_CREATED, true). --define(START_AFTER_CREATED_RAW, <<"true">>). -define(TEST_ID_PREFIX, "_probe_:"). -define(RES_METRICS, resource_metrics). diff --git a/apps/emqx_resource/src/emqx_resource.app.src b/apps/emqx_resource/src/emqx_resource.app.src index 57ab8129a..19b6ca5e2 100644 --- a/apps/emqx_resource/src/emqx_resource.app.src +++ b/apps/emqx_resource/src/emqx_resource.app.src @@ -1,7 +1,7 @@ %% -*- mode: erlang -*- {application, emqx_resource, [ {description, "Manager for all external resources"}, - {vsn, "0.1.19"}, + {vsn, "0.1.20"}, {registered, []}, {mod, {emqx_resource_app, []}}, {applications, [ diff --git a/apps/emqx_resource/src/schema/emqx_resource_schema.erl b/apps/emqx_resource/src/schema/emqx_resource_schema.erl index 59687eb8d..b98f50a98 100644 --- a/apps/emqx_resource/src/schema/emqx_resource_schema.erl +++ b/apps/emqx_resource/src/schema/emqx_resource_schema.erl @@ -129,7 +129,7 @@ health_check_interval_range(HealthCheckInterval) -> start_after_created(type) -> boolean(); start_after_created(desc) -> ?DESC("start_after_created"); -start_after_created(default) -> ?START_AFTER_CREATED_RAW; +start_after_created(default) -> ?START_AFTER_CREATED; start_after_created(required) -> false; start_after_created(_) -> undefined.