From 12859b8959f175d965de38210a6c7aa2f6a36183 Mon Sep 17 00:00:00 2001 From: Kjell Winblad Date: Thu, 20 Jun 2024 10:03:49 +0200 Subject: [PATCH] fix: handle yet another action format --- apps/emqx_rule_engine/include/rule_engine.hrl | 3 ++- apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/emqx_rule_engine/include/rule_engine.hrl b/apps/emqx_rule_engine/include/rule_engine.hrl index ec64bc596..7d0000a1c 100644 --- a/apps/emqx_rule_engine/include/rule_engine.hrl +++ b/apps/emqx_rule_engine/include/rule_engine.hrl @@ -43,7 +43,8 @@ args => action_fun_args() } | bridge_channel_id() - | {bridge_v2, emqx_bridge_v2:bridge_v2_type(), emqx_bridge_v2:bridge_v2_name()}. + | {bridge_v2, emqx_bridge_v2:bridge_v2_type(), emqx_bridge_v2:bridge_v2_name()} + | {bridge, emqx_utils_maps:config_key(), emqx_utils_maps:config_key(), bridge_channel_id()}. -type rule() :: #{ diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl index 7e235b4ee..da7ec420e 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl @@ -96,6 +96,12 @@ format_action(BridgeChannelId) when is_binary(BridgeChannelId) -> " Type: data-bridge\n" ,[BridgeChannelId] ); +format_action({bridge, ActionType, ActionName, _Id}) -> + io_lib:format("- Name: ~p\n" + " Action Type: ~p\n" + " Type: data-bridge\n" + ,[ActionName, ActionType] + ); format_action({bridge_v2, ActionType, ActionName}) -> io_lib:format("- Name: ~p\n" " Action Type: ~p\n"