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

fix: bridge_v1 http api crash when create rabbitmq source

This commit is contained in:
zhongwencool 2024-02-21 15:30:05 +08:00
parent 8ae58c8066
commit 2a7a662c03
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge/src/emqx_bridge_v2.erl
View File

@ -1221,6 +1221,10 @@ unpack_bridge_conf(Type, PackedConf, TopLevelConf) ->
bridge_v1_is_valid(BridgeV1Type, BridgeName) -> bridge_v1_is_valid(BridgeV1Type, BridgeName) ->
bridge_v1_is_valid(?ROOT_KEY_ACTIONS, BridgeV1Type, BridgeName). bridge_v1_is_valid(?ROOT_KEY_ACTIONS, BridgeV1Type, BridgeName).
%% rabbitmq's source don't have v1 version. but action has v1 version...
%% There's no good way to distinguish it, so it has to be hardcoded here.
bridge_v1_is_valid(?ROOT_KEY_SOURCES, rabbitmq, _BridgeName) ->
false;
bridge_v1_is_valid(ConfRootKey, BridgeV1Type, BridgeName) -> bridge_v1_is_valid(ConfRootKey, BridgeV1Type, BridgeName) ->
BridgeV2Type = ?MODULE:bridge_v1_type_to_bridge_v2_type(BridgeV1Type), BridgeV2Type = ?MODULE:bridge_v1_type_to_bridge_v2_type(BridgeV1Type),
case lookup_conf(ConfRootKey, BridgeV2Type, BridgeName) of case lookup_conf(ConfRootKey, BridgeV2Type, BridgeName) of

2
apps/emqx_bridge_rabbitmq/test/emqx_bridge_rabbitmq_v2_SUITE.erl
View File

@ -144,6 +144,8 @@ t_source(Config) ->
Name = atom_to_binary(?FUNCTION_NAME), Name = atom_to_binary(?FUNCTION_NAME),
create_source(Name), create_source(Name),
Sources = emqx_bridge_v2:list(sources), Sources = emqx_bridge_v2:list(sources),
%% Don't show rabbitmq source in bridge_v1_list
?assertEqual([], emqx_bridge_v2:bridge_v1_list_and_transform()),
Any = fun(#{name := BName}) -> BName =:= Name end, Any = fun(#{name := BName}) -> BName =:= Name end,
?assert(lists:any(Any, Sources), Sources), ?assert(lists:any(Any, Sources), Sources),
Topic = <<"tesldkafd">>, Topic = <<"tesldkafd">>,