From 7d9403d05634bf5478a04324f5514a0759dbdb82 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Sun, 24 Apr 2022 15:13:36 +0800
Subject: [PATCH] fix: add namespace to schema

---
 apps/emqx/src/emqx_schema.erl                               | 4 ++--
 apps/emqx_conf/src/emqx_conf_schema.erl                     | 2 +-
 apps/emqx_connector/src/emqx_connector_schema.erl           | 4 +++-
 apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl | 5 ++++-
 apps/emqx_dashboard/src/emqx_dashboard_schema.erl           | 2 +-
 apps/emqx_psk/src/emqx_psk_schema.erl                       | 3 +++
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 7e72f52df..5f7e7f498 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -102,7 +102,7 @@
 
 -elvis([{elvis_style, god_modules, disable}]).
 
-namespace() -> undefined.
+namespace() -> broker.
 
 roots() ->
     %% TODO change config importance to a field metadata
@@ -2219,7 +2219,7 @@ authentication(Desc) ->
                 undefined -> Default;
                 Module -> hoconsc:lazy(Module:root_type())
             end,
-        desc_id => authentication_0,
+        desc_id => "authentication_0",
         desc => iolist_to_binary([
             Desc,
             "\nAuthentication can be one single authenticator instance or a chain of "
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index 4c8916835..f13f7a9fe 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -62,7 +62,7 @@
         , emqx_slow_subs_schema
         ]).
 
-namespace() -> undefined.
+namespace() -> cluster.
 
 roots() ->
     PtKey = ?EMQX_AUTHENTICATION_SCHEMA_MODULE_PT_KEY,
diff --git a/apps/emqx_connector/src/emqx_connector_schema.erl b/apps/emqx_connector/src/emqx_connector_schema.erl
index 5b0309e00..2b1d026b1 100644
--- a/apps/emqx_connector/src/emqx_connector_schema.erl
+++ b/apps/emqx_connector/src/emqx_connector_schema.erl
@@ -22,7 +22,7 @@
 
 -import(hoconsc, [mk/2, ref/2]).
 
--export([roots/0, fields/1, desc/1]).
+-export([namespace/0, roots/0, fields/1, desc/1]).
 
 -export([ get_response/0
         , put_request/0
@@ -51,6 +51,8 @@ http_schema(Method) ->
 %%======================================================================================
 %% Hocon Schema Definitions
 
+namespace() -> connector.
+
 roots() -> ["connectors"].
 
 fields(connectors) -> fields("connectors");
diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
index fb749505a..e450dc5ce 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
@@ -21,7 +21,8 @@
 
 -behaviour(hocon_schema).
 
--export([ roots/0
+-export([ namespace/0
+        , roots/0
         , fields/1
         , desc/1
         ]).
@@ -34,6 +35,8 @@
 
 -import(emqx_schema, [mk_duration/2]).
 
+namespace() -> "connector-mqtt".
+
 roots() ->
     fields("config").
 
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
index 404648b14..27a7aa571 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
@@ -24,7 +24,7 @@
     desc/1
 ]).
 
-namespace() -> <<"dashboard">>.
+namespace() -> dashboard.
 roots() -> ["dashboard"].
 
 fields("dashboard") ->
diff --git a/apps/emqx_psk/src/emqx_psk_schema.erl b/apps/emqx_psk/src/emqx_psk_schema.erl
index 7a1dd994c..bb8deb677 100644
--- a/apps/emqx_psk/src/emqx_psk_schema.erl
+++ b/apps/emqx_psk/src/emqx_psk_schema.erl
@@ -22,12 +22,15 @@
 -include_lib("hocon/include/hoconsc.hrl").
 
 -export([
+    namespace/0,
     roots/0,
     fields/1
 ]).
 
 -import(emqx_schema, [sc/2]).
 
+namespace() -> "authn-psk".
+
 roots() -> ["psk_authentication"].
 
 fields("psk_authentication") ->