From be7a8c11a8227a572e361f3b1cac9a3852a15f6c Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Thu, 15 Sep 2022 16:21:32 +0200
Subject: [PATCH] test: make bridge name unique in tests

---
 .../emqx_bridge_impl_kafka_producer_SUITE.erl | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl
index 775942015..1c79e9bd8 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl
@@ -38,23 +38,28 @@ do_publish(Conf, KafkaTopic, InstId) ->
     },
     {ok, Offset} = resolve_kafka_offset(kafka_hosts(), KafkaTopic, 0),
     ct:pal("base offset before testing ~p", [Offset]),
-    {ok, State} = ?PRODUCER:on_start(InstId, Conf),
-    ok = ?PRODUCER:on_query(InstId, {send_message, Msg}, State),
+    StartRes = ?PRODUCER:on_start(InstId, Conf),
+    {ok, State} = StartRes,
+    OnQueryRes = ?PRODUCER:on_query(InstId, {send_message, Msg}, State),
+    ok = OnQueryRes,
     {ok, {_, [KafkaMsg]}} = brod:fetch(kafka_hosts(), KafkaTopic, 0, Offset),
     ?assertMatch(#kafka_message{key = BinTime}, KafkaMsg),
     ok = ?PRODUCER:on_stop(InstId, State),
     ok.
 
 t_publish(_CtConfig) ->
+    InstId = emqx_bridge_resource:resource_id("kafka", "NoAuthInst"),
     KafkaTopic = "test-topic-one-partition",
     Conf = config(#{
         "authentication" => "none",
         "kafka_hosts_string" => kafka_hosts_string(),
-        "kafka_topic" => KafkaTopic
+        "kafka_topic" => KafkaTopic,
+        "instance_id" => InstId
     }),
-    do_publish(Conf, KafkaTopic, <<"NoAuthInst">>).
+    do_publish(Conf, KafkaTopic, InstId).
 
 t_publish_sasl_plain(_CtConfig) ->
+    InstId = emqx_bridge_resource:resource_id("kafka", "SASLPlainInst"),
     KafkaTopic = "test-topic-one-partition",
     Conf = config(#{
         "authentication" => #{
@@ -63,11 +68,14 @@ t_publish_sasl_plain(_CtConfig) ->
             "password" => "password"
         },
         "kafka_hosts_string" => kafka_hosts_string_sasl(),
-        "kafka_topic" => KafkaTopic
+        "kafka_topic" => KafkaTopic,
+        "instance_id" => InstId
     }),
-    do_publish(Conf, KafkaTopic, <<"SASLPlainInst">>).
+    do_publish(Conf, KafkaTopic, InstId).
 
 t_publish_sasl_scram256(_CtConfig) ->
+    InstId = emqx_bridge_resource:resource_id("kafka", "SASLScram256Inst"),
+    KafkaTopic = "test-topic-one-partition",
     KafkaTopic = "test-topic-one-partition",
     Conf = config(#{
         "authentication" => #{
@@ -76,11 +84,13 @@ t_publish_sasl_scram256(_CtConfig) ->
             "password" => "password"
         },
         "kafka_hosts_string" => kafka_hosts_string_sasl(),
-        "kafka_topic" => KafkaTopic
+        "kafka_topic" => KafkaTopic,
+        "instance_id" => InstId
     }),
-    do_publish(Conf, KafkaTopic, <<"SASLScram256Inst">>).
+    do_publish(Conf, KafkaTopic, InstId).
 
 t_publish_sasl_scram512(_CtConfig) ->
+    InstId = emqx_bridge_resource:resource_id("kafka", "SASLScram512Inst"),
     KafkaTopic = "test-topic-one-partition",
     Conf = config(#{
         "authentication" => #{
@@ -89,11 +99,13 @@ t_publish_sasl_scram512(_CtConfig) ->
             "password" => "password"
         },
         "kafka_hosts_string" => kafka_hosts_string_sasl(),
-        "kafka_topic" => KafkaTopic
+        "kafka_topic" => KafkaTopic,
+        "instance_id" => InstId
     }),
-    do_publish(Conf, KafkaTopic, <<"SASLScram512Inst">>).
+    do_publish(Conf, KafkaTopic, InstId).
 
 t_publish_sasl_kerberos(_CtConfig) ->
+    InstId = emqx_bridge_resource:resource_id("kafka", "SASLKerberosInst"),
     KafkaTopic = "test-topic-one-partition",
     Conf = config(#{
         "authentication" => #{
@@ -101,9 +113,10 @@ t_publish_sasl_kerberos(_CtConfig) ->
             "kerberos_keytab_file" => "/var/lib/secret/rig.key"
         },
         "kafka_hosts_string" => kafka_hosts_string_sasl(),
-        "kafka_topic" => KafkaTopic
+        "kafka_topic" => KafkaTopic,
+        "instance_id" => InstId
     }),
-    do_publish(Conf, KafkaTopic, <<"SASLKerberosInst">>).
+    do_publish(Conf, KafkaTopic, InstId).
 
 config(Args) ->
     {ok, Conf} = hocon:binary(hocon_config(Args)),
@@ -112,7 +125,8 @@ config(Args) ->
         #{<<"config">> => Conf},
         #{atom_key => true}
     ),
-    Parsed#{bridge_name => "testbridge"}.
+    InstId = maps:get("instance_id", Args),
+    Parsed#{bridge_name => erlang:element(2, emqx_bridge_resource:parse_bridge_id(InstId))}.
 
 hocon_config(Args) ->
     AuthConf = maps:get("authentication", Args),