From 3c778121a512826b8dbbd4d8b720352139adef9f Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Mon, 6 Nov 2023 08:01:57 +0100
Subject: [PATCH] fix: bridge V1 type lookup issue

---
 .../include/emqx_bridge_v2_register.hrl       | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/emqx_bridge/include/emqx_bridge_v2_register.hrl b/apps/emqx_bridge/include/emqx_bridge_v2_register.hrl
index 79e009fe9..362b671ad 100644
--- a/apps/emqx_bridge/include/emqx_bridge_v2_register.hrl
+++ b/apps/emqx_bridge/include/emqx_bridge_v2_register.hrl
@@ -78,41 +78,50 @@ internal_register_bridge_type_with_lock(BridgeTypeInfo) ->
         InfoMap2,
         maps:get(bridge_v2_type_name, BridgeTypeInfo)
     ),
+    %% Backwards compatibility
     InfoMap4 = emqx_utils_maps:deep_force_put(
         [
-            bridge_v2_type_to_connector_type,
+            bridge_v1_type_to_bridge_v2_type,
             maps:get(bridge_v2_type_name, BridgeTypeInfo)
         ],
         InfoMap3,
-        maps:get(connector_type, BridgeTypeInfo)
+        maps:get(bridge_v2_type_name, BridgeTypeInfo)
     ),
-    %% Backwards compatibility
     InfoMap5 = emqx_utils_maps:deep_force_put(
         [
             bridge_v2_type_to_connector_type,
-            maps:get(bridge_v1_type_name, BridgeTypeInfo)
+            maps:get(bridge_v2_type_name, BridgeTypeInfo)
         ],
         InfoMap4,
         maps:get(connector_type, BridgeTypeInfo)
     ),
+    %% Backwards compatibility
     InfoMap6 = emqx_utils_maps:deep_force_put(
+        [
+            bridge_v2_type_to_connector_type,
+            maps:get(bridge_v1_type_name, BridgeTypeInfo)
+        ],
+        InfoMap5,
+        maps:get(connector_type, BridgeTypeInfo)
+    ),
+    InfoMap7 = emqx_utils_maps:deep_force_put(
         [
             bridge_v2_type_to_schema_module,
             maps:get(bridge_v2_type_name, BridgeTypeInfo)
         ],
-        InfoMap5,
+        InfoMap6,
         maps:get(schema_module, BridgeTypeInfo)
     ),
-    InfoMap7 = emqx_utils_maps:deep_force_put(
+    InfoMap8 = emqx_utils_maps:deep_force_put(
         [
             bridge_v2_type_to_schema_struct_field,
             maps:get(bridge_v2_type_name, BridgeTypeInfo)
         ],
-        InfoMap6,
+        InfoMap7,
         maps:get(schema_struct_field, BridgeTypeInfo)
     ),
 
-    ok = persistent_term:put(internal_emqx_bridge_v2_persistent_term_info_key(), InfoMap7).
+    ok = persistent_term:put(internal_emqx_bridge_v2_persistent_term_info_key(), InfoMap8).
 
 internal_maybe_create_initial_bridge_v2_info_map() ->
     case persistent_term:get(internal_emqx_bridge_v2_persistent_term_info_key(), undefined) of