diff --git a/.github/workflows/run_helm_tests.yaml b/.github/workflows/run_helm_tests.yaml index 9c314afde..5fc215f02 100644 --- a/.github/workflows/run_helm_tests.yaml +++ b/.github/workflows/run_helm_tests.yaml @@ -37,7 +37,10 @@ jobs: profile: - emqx - emqx-enterprise - + rpc: + - tcp + - ssl1.3 + - ssl1.2 steps: - uses: actions/checkout@v3 with: @@ -53,6 +56,40 @@ jobs: echo "${stderr}"; exit 1; fi + - name: Prepare emqxConfig.EMQX_RPC using TCP + working-directory: source + if: matrix.rpc == 'tcp' + run: | + cat > rpc-overrides.yaml < rpc-overrides.yaml < rpc-overrides.yaml < ]; translation("gen_rpc") -> [ - {"default_client_driver", fun tr_default_config_driver/1}, + {"default_client_driver", fun tr_gen_rpc_default_client_driver/1}, {"ssl_client_options", fun tr_gen_rpc_ssl_options/1}, {"ssl_server_options", fun tr_gen_rpc_ssl_options/1}, {"socket_ip", fun(Conf) -> @@ -1223,8 +1223,8 @@ tr_vm_msacc_collector(Conf) -> collector_enabled(enabled, Collector) -> [Collector]; collector_enabled(disabled, _) -> []. -tr_default_config_driver(Conf) -> - conf_get("rpc.driver", Conf). +tr_gen_rpc_default_client_driver(Conf) -> + conf_get("rpc.protocol", Conf). tr_gen_rpc_ssl_options(Conf) -> Ciphers = conf_get("rpc.ciphers", Conf), diff --git a/changes/ce/fix-11796.en.md b/changes/ce/fix-11796.en.md new file mode 100644 index 000000000..aa1214f99 --- /dev/null +++ b/changes/ce/fix-11796.en.md @@ -0,0 +1,2 @@ +Fix rpc schema, ensure client/server use same transport driver. + diff --git a/changes/ce/fix-11796.zh.md b/changes/ce/fix-11796.zh.md new file mode 100644 index 000000000..60f1d0b94 --- /dev/null +++ b/changes/ce/fix-11796.zh.md @@ -0,0 +1,2 @@ +修复 rpc schema,确保客户端/服务端使用相同的传输驱动。 + diff --git a/mix.exs b/mix.exs index 1c1056821..4cf1e51e4 100644 --- a/mix.exs +++ b/mix.exs @@ -56,7 +56,7 @@ defmodule EMQXUmbrella.MixProject do {:esockd, github: "emqx/esockd", tag: "5.9.7", override: true}, {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.8.0-emqx-1", override: true}, {:ekka, github: "emqx/ekka", tag: "0.15.16", override: true}, - {:gen_rpc, github: "emqx/gen_rpc", tag: "3.2.0", override: true}, + {:gen_rpc, github: "emqx/gen_rpc", tag: "3.2.1", override: true}, {:grpc, github: "emqx/grpc-erl", tag: "0.6.8", override: true}, {:minirest, github: "emqx/minirest", tag: "1.3.13", override: true}, {:ecpool, github: "emqx/ecpool", tag: "0.5.4", override: true}, diff --git a/rebar.config b/rebar.config index e2e1a7cf0..753487a75 100644 --- a/rebar.config +++ b/rebar.config @@ -63,7 +63,7 @@ , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.7"}}} , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.8.0-emqx-1"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.16"}}} - , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.2.0"}}} + , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.2.1"}}} , {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.8"}}} , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.13"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.4"}}}