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

Merge pull request #12357 from thalesmg/fix-bridge-bpapi-interval-r55-20240119 

fix(bridge_api): explicitly state bpapi version ranges
This commit is contained in:
Thales Macedo Garitezi 2024-01-19 13:08:44 -03:00 committed by GitHub
parent 270eb81f8e 4068258c78
commit a40a13b786
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/emqx_bridge/src/emqx_bridge_api.erl
View File

@ -1132,15 +1132,14 @@ maybe_unwrap({error, not_implemented}) ->
maybe_unwrap(RpcMulticallResult) ->
emqx_rpc:unwrap_erpc(RpcMulticallResult).
supported_versions(start_bridge_to_node) -> bpapi_version_range(2, latest);
supported_versions(start_bridges_to_all_nodes) -> bpapi_version_range(2, latest);
supported_versions(get_metrics_from_all_nodes) -> bpapi_version_range(4, latest);
supported_versions(_Call) -> bpapi_version_range(1, latest).
supported_versions(start_bridge_to_node) -> bpapi_version_range(2, 6);
supported_versions(start_bridges_to_all_nodes) -> bpapi_version_range(2, 6);
supported_versions(get_metrics_from_all_nodes) -> bpapi_version_range(4, 6);
supported_versions(_Call) -> bpapi_version_range(1, 6).
%% [From, To] (inclusive on both ends)
bpapi_version_range(From, latest) ->
ThisNodeVsn = emqx_bpapi:supported_version(node(), ?BPAPI_NAME),
lists:seq(From, ThisNodeVsn).
bpapi_version_range(From, To) ->
lists:seq(From, To).
redact(Term) ->
emqx_utils:redact(Term).

7
apps/emqx_bridge/src/emqx_bridge_v2_api.erl
View File

@ -1052,12 +1052,11 @@ do_bpapi_call_vsn(Version, Call, Args) ->
is_supported_version(Version, Call) ->
lists:member(Version, supported_versions(Call)).
supported_versions(_Call) -> bpapi_version_range(6, latest).
supported_versions(_Call) -> bpapi_version_range(6, 6).
%% [From, To] (inclusive on both ends)
bpapi_version_range(From, latest) ->
ThisNodeVsn = emqx_bpapi:supported_version(node(), ?BPAPI_NAME),
lists:seq(From, ThisNodeVsn).
bpapi_version_range(From, To) ->
lists:seq(From, To).
maybe_unwrap({error, not_implemented}) ->
{error, not_implemented};