From eacc7768d25456b219ba97190f486dd2f5cd5282 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Fri, 27 May 2022 18:54:25 +0800
Subject: [PATCH 1/2] fix: make 'name' field optional

---
 .../src/emqx_rule_engine_schema.erl           | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
index 82697b97f..61b8dd4b9 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
@@ -28,7 +28,7 @@
     desc/1
 ]).
 
--export([validate_sql/1, validate_rule_name/1]).
+-export([validate_sql/1]).
 
 namespace() -> rule_engine.
 
@@ -187,26 +187,11 @@ rule_name() ->
             #{
                 desc => ?DESC("rules_name"),
                 default => "",
-                required => true,
-                example => "foo",
-                validator => fun ?MODULE:validate_rule_name/1
+                required => false,
+                example => "foo"
             }
         )}.
 
-validate_rule_name(Name) ->
-    RE = "^[A-Za-z0-9]+[A-Za-z0-9-_]*$",
-    try re:run(Name, RE) of
-        {match, _} ->
-            ok;
-        _Nomatch ->
-            Reason = list_to_binary(io_lib:format("Bad rule name ~p, expect ~p", [Name, RE])),
-            {error, Reason}
-    catch
-        _:_ ->
-            Reason = list_to_binary(io_lib:format("Bad rule name ~p, expect ~p", [Name, RE])),
-            {error, Reason}
-    end.
-
 actions() ->
     [
         binary(),

From b846220ffdbe6c1699921c9aeff4f549d96163e3 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Sat, 28 May 2022 17:15:56 +0800
Subject: [PATCH 2/2] fix(test): discard already_started error for gpc test
 server

---
 apps/emqx_gateway/test/emqx_exproto_echo_svr.erl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_gateway/test/emqx_exproto_echo_svr.erl b/apps/emqx_gateway/test/emqx_exproto_echo_svr.erl
index ecc8999ce..25f25ba0c 100644
--- a/apps/emqx_gateway/test/emqx_exproto_echo_svr.erl
+++ b/apps/emqx_gateway/test/emqx_exproto_echo_svr.erl
@@ -106,10 +106,13 @@ end).
 
 start() ->
     application:ensure_all_started(grpc),
-    [start_channel(), start_server()].
+    [ensure_channel(), start_server()].
 
-start_channel() ->
-    grpc_client_sup:create_channel_pool(ct_test_channel, "http://127.0.0.1:9100", #{}).
+ensure_channel() ->
+    case grpc_client_sup:create_channel_pool(ct_test_channel, "http://127.0.0.1:9100", #{}) of
+        {error, {already_started, Pid}} -> {ok, Pid};
+        {ok, Pid} -> {ok, Pid}
+    end.
 
 start_server() ->
     Services = #{