From 862283ff7c7d5d12ae236ce256729e440dce0b49 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Wed, 20 Dec 2023 13:10:50 -0300
Subject: [PATCH] test: fix expected connector name after name convention
 generation changed

---
 .../test/emqx_bridge_gcp_pubsub_producer_SUITE.erl        | 8 ++++++--
 apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_producer_SUITE.erl b/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_producer_SUITE.erl
index e030bbc74..92e4e09a6 100644
--- a/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_producer_SUITE.erl
+++ b/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_producer_SUITE.erl
@@ -159,7 +159,7 @@ generate_config(Config0) ->
     } = gcp_pubsub_config(Config0),
     %% FIXME
     %% `emqx_bridge_resource:resource_id' requires an existing connector in the config.....
-    ConnectorName = <<"connector_", ActionName/binary>>,
+    ConnectorName = ActionName,
     ConnectorResourceId = <<"connector:", ?CONNECTOR_TYPE_BIN/binary, ":", ConnectorName/binary>>,
     ActionResourceId = emqx_bridge_v2:id(?ACTION_TYPE_BIN, ActionName, ConnectorName),
     BridgeId = emqx_bridge_resource:bridge_id(?BRIDGE_V1_TYPE_BIN, ActionName),
@@ -1228,7 +1228,11 @@ do_econnrefused_or_timeout_test(Config, Error) ->
                             %% _Msg = "The connection was lost."
                             ok;
                         Trace0 ->
-                            error({unexpected_trace, Trace0})
+                            error(
+                                {unexpected_trace, Trace0, #{
+                                    expected_connector_id => ConnectorResourceId
+                                }}
+                            )
                     end;
                 timeout ->
                     ?assertMatch(
diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index bb3ca87b7..6e520ba58 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -412,7 +412,7 @@ t_create_webhook_v1_bridges_api(Config) ->
                 #{
                     <<"webhook_name">> =>
                         #{
-                            <<"connector">> => <<"connector_webhook_name">>,
+                            <<"connector">> => <<"webhook_name">>,
                             <<"description">> => <<>>,
                             <<"enable">> => true,
                             <<"parameters">> =>
@@ -440,7 +440,7 @@ t_create_webhook_v1_bridges_api(Config) ->
         #{
             <<"http">> =>
                 #{
-                    <<"connector_webhook_name">> =>
+                    <<"webhook_name">> =>
                         #{
                             <<"connect_timeout">> => <<"15s">>,
                             <<"description">> => <<>>,