From bcc78950a93cc227b4288562b108915760ace19d Mon Sep 17 00:00:00 2001
From: firest <blankalupo@163.com>
Date: Tue, 26 Jul 2022 14:33:04 +0800
Subject: [PATCH] fix(limiter): fix schema error

---
 .../emqx_limiter/src/emqx_limiter_schema.erl  | 99 +++++++++----------
 apps/emqx/src/emqx_schema.erl                 |  6 +-
 .../src/emqx_retainer_schema.erl              |  2 +-
 3 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
index 23d4d4e4c..89c927950 100644
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
@@ -31,8 +31,7 @@
     get_bucket_cfg_path/2,
     desc/1,
     types/0,
-    infinity_value/0,
-    bucket_fields/1
+    infinity_value/0
 ]).
 
 -define(KILOBYTE, 1024).
@@ -92,7 +91,7 @@ fields(limiter) ->
         {Type,
             ?HOCON(?R_REF(node_opts), #{
                 desc => ?DESC(Type),
-                default => make_limiter_default(Type)
+                default => #{}
             })}
      || Type <- types()
     ] ++
@@ -179,17 +178,12 @@ fields(client_opts) ->
                 }
             )}
     ];
-fields({client_fields, Types}) ->
-    [
-        {Type,
-            ?HOCON(?R_REF(client_opts), #{
-                desc => ?DESC(Type),
-                required => false
-            })}
-     || Type <- Types
-    ];
-fields({bucket_fields, Types}) ->
-    bucket_fields(Types).
+fields(listener_fields) ->
+    bucket_fields([bytes_in, message_in, connection, message_routing], listener_client_fields);
+fields(listener_client_fields) ->
+    client_fields([bytes_in, message_in, connection, message_routing]);
+fields(Type) ->
+    bucket_field(Type).
 
 desc(limiter) ->
     "Settings for the rate limiter.";
@@ -202,38 +196,6 @@ desc(client_opts) ->
 desc(_) ->
     undefined.
 
-bucket_fields(Type) when is_atom(Type) ->
-    fields(bucket_opts) ++
-        [
-            {client,
-                ?HOCON(
-                    ?R_REF(?MODULE, client_opts),
-                    #{
-                        desc => ?DESC(client),
-                        required => false
-                    }
-                )}
-        ];
-bucket_fields(Types) ->
-    [
-        {Type,
-            ?HOCON(?R_REF(?MODULE, bucket_opts), #{
-                desc => ?DESC(?MODULE, Type),
-                required => false
-            })}
-     || Type <- Types
-    ] ++
-        [
-            {client,
-                ?HOCON(
-                    ?R_REF(?MODULE, {client_fields, Types}),
-                    #{
-                        desc => ?DESC(client),
-                        required => false
-                    }
-                )}
-        ].
-
 %% default period is 100ms
 default_period() ->
     100.
@@ -366,7 +328,44 @@ apply_unit("mb", Val) -> Val * ?KILOBYTE * ?KILOBYTE;
 apply_unit("gb", Val) -> Val * ?KILOBYTE * ?KILOBYTE * ?KILOBYTE;
 apply_unit(Unit, _) -> throw("invalid unit:" ++ Unit).
 
-make_limiter_default(connection) ->
-    #{<<"rate">> => <<"1000/s">>};
-make_limiter_default(_) ->
-    #{}.
+bucket_field(Type) when is_atom(Type) ->
+    fields(bucket_opts) ++
+        [
+            {client,
+                ?HOCON(
+                    ?R_REF(?MODULE, client_opts),
+                    #{
+                        desc => ?DESC(client),
+                        required => false
+                    }
+                )}
+        ].
+bucket_fields(Types, ClientRef) ->
+    [
+        {Type,
+            ?HOCON(?R_REF(?MODULE, bucket_opts), #{
+                desc => ?DESC(?MODULE, Type),
+                required => false
+            })}
+     || Type <- Types
+    ] ++
+        [
+            {client,
+                ?HOCON(
+                    ?R_REF(?MODULE, ClientRef),
+                    #{
+                        desc => ?DESC(client),
+                        required => false
+                    }
+                )}
+        ].
+
+client_fields(Types) ->
+    [
+        {Type,
+            ?HOCON(?R_REF(client_opts), #{
+                desc => ?DESC(Type),
+                required => false
+            })}
+     || Type <- Types
+    ].
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 81f5c922a..f7c18ae8e 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -1621,11 +1621,13 @@ base_listener(Bind) ->
             sc(
                 ?R_REF(
                     emqx_limiter_schema,
-                    {bucket_fields, [bytes_in, message_in, connection, message_routing]}
+                    listener_fields
                 ),
                 #{
                     desc => ?DESC(base_listener_limiter),
-                    default => #{}
+                    default => #{
+                        <<"connection">> => #{<<"rate">> => <<"1000/s">>, <<"capacity">> => 1000}
+                    }
                 }
             )},
         {"enable_authn",
diff --git a/apps/emqx_retainer/src/emqx_retainer_schema.erl b/apps/emqx_retainer/src/emqx_retainer_schema.erl
index 986eb4105..51dbf496b 100644
--- a/apps/emqx_retainer/src/emqx_retainer_schema.erl
+++ b/apps/emqx_retainer/src/emqx_retainer_schema.erl
@@ -86,7 +86,7 @@ fields(flow_control) ->
             )},
         {batch_deliver_limiter,
             sc(
-                ?R_REF(emqx_limiter_schema, {bucket_fields, internal}),
+                ?R_REF(emqx_limiter_schema, internal),
                 batch_deliver_limiter,
                 undefined
             )}