test: rename a test option name to avoid clashing with prod config name

lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_redis_SUITE.erl

@@ -32,7 +32,7 @@
 -define(PROXY_HOST, "toxiproxy").
 -define(PROXY_PORT, "8474").
 
-all() -> [{group, redis_types}, {group, rest}].
+all() -> [{group, transport_types}, {group, rest}].
 
 groups() ->
     ResourceSpecificTCs = [t_create_delete_bridge],
@@ -48,7 +48,7 @@ groups() ->
     ],
     [
         {rest, TCs},
-        {redis_types, [
+        {transport_types, [
             {group, tcp},
             {group, tls}
         ]},
@@ -64,7 +64,7 @@ groups() ->
 init_per_group(Group, Config) when
     Group =:= redis_single; Group =:= redis_sentinel; Group =:= redis_cluster
 ->
-    [{redis_type, Group} | Config];
+    [{transport_type, Group} | Config];
 init_per_group(Group, Config) when
     Group =:= tcp; Group =:= tls
 ->
@@ -117,7 +117,7 @@ end_per_suite(_Config) ->
 
 init_per_testcase(_Testcase, Config) ->
     ok = delete_all_bridges(),
-    case ?config(redis_type, Config) of
+    case ?config(transport_type, Config) of
         undefined ->
             Config;
         RedisType ->
@@ -140,7 +140,7 @@ end_per_testcase(_Testcase, Config) ->
 
 t_create_delete_bridge(Config) ->
     Name = <<"mybridge">>,
-    Type = ?config(redis_type, Config),
+    Type = ?config(transport_type, Config),
     BridgeConfig = ?config(bridge_config, Config),
     IsBatch = ?config(is_batch, Config),
     ?assertMatch(
@@ -426,37 +426,37 @@ redis_connect_configs() ->
     #{
         redis_single => #{
             tcp => #{
-                <<"redis_type">> => <<"single">>,
+                <<"server">> => <<"redis:6379">>,
-                <<"server">> => <<"redis:6379">>
+                <<"redis_type">> => <<"single">>
             },
             tls => #{
-                <<"redis_type">> => <<"single">>,
                 <<"server">> => <<"redis-tls:6380">>,
-                <<"ssl">> => redis_connect_ssl_opts(redis_single)
+                <<"ssl">> => redis_connect_ssl_opts(redis_single),
+                <<"redis_type">> => <<"single">>
             }
         },
         redis_sentinel => #{
             tcp => #{
-                <<"redis_type">> => <<"sentinel">>,
                 <<"servers">> => <<"redis-sentinel:26379">>,
+                <<"redis_type">> => <<"sentinel">>,
                 <<"sentinel">> => <<"mymaster">>
             },
             tls => #{
-                <<"redis_type">> => <<"sentinel">>,
                 <<"servers">> => <<"redis-sentinel-tls:26380">>,
+                <<"redis_type">> => <<"sentinel">>,
                 <<"sentinel">> => <<"mymaster">>,
                 <<"ssl">> => redis_connect_ssl_opts(redis_sentinel)
             }
         },
         redis_cluster => #{
             tcp => #{
-                <<"redis_type">> => <<"cluster">>,
+                <<"servers">> => <<"redis-cluster:7000,redis-cluster:7001,redis-cluster:7002">>,
-                <<"servers">> => <<"redis-cluster:7000,redis-cluster:7001,redis-cluster:7002">>
+                <<"redis_type">> => <<"cluster">>
             },
             tls => #{
-                <<"redis_type">> => <<"cluster">>,
                 <<"servers">> =>
                     <<"redis-cluster-tls:8000,redis-cluster-tls:8001,redis-cluster-tls:8002">>,
+                <<"redis_type">> => <<"cluster">>,
                 <<"ssl">> => redis_connect_ssl_opts(redis_cluster)
             }
         }