From 6c85e62d268bb85a24dff327ade263ec6624924c Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Tue, 28 Nov 2023 12:07:42 +0100
Subject: [PATCH] fix(schema): add namespaces

---
 apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl     | 2 +-
 .../src/emqx_bridge_syskeeper_connector.erl               | 4 +++-
 apps/emqx_conf/src/emqx_conf.erl                          | 2 +-
 apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl   | 8 +++++++-
 apps/emqx_gateway_ocpp/src/emqx_ocpp_schema.erl           | 6 +++++-
 .../src/schema/emqx_postgresql_connector_schema.erl       | 4 ++++
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl b/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl
index 2e3d882d5..a10646bac 100644
--- a/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl
+++ b/apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl
@@ -24,7 +24,7 @@
 
 %%======================================================================================
 %% Hocon Schema Definitions
-namespace() -> "bridge_webhook".
+namespace() -> "bridge_http".
 
 roots() -> [].
 
diff --git a/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl b/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl
index 49942065a..6887582b3 100644
--- a/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl
+++ b/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl
@@ -12,7 +12,7 @@
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 -include_lib("hocon/include/hoconsc.hrl").
 
--export([roots/0, fields/1, desc/1, connector_examples/1]).
+-export([namespace/0, roots/0, fields/1, desc/1, connector_examples/1]).
 
 %% `emqx_resource' API
 -export([
@@ -44,6 +44,8 @@
 
 %% -------------------------------------------------------------------------------------------------
 %% api
+namespace() -> "syskeeper_forwarder".
+
 connector_examples(Method) ->
     [
         #{
diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl
index 0925141de..0d2ee72e4 100644
--- a/apps/emqx_conf/src/emqx_conf.erl
+++ b/apps/emqx_conf/src/emqx_conf.erl
@@ -306,7 +306,7 @@ gen_flat_doc(RootNames, #{full_name := FullName, fields := Fields} = S) ->
     ShortName = short_name(FullName),
     case is_missing_namespace(ShortName, to_bin(FullName), RootNames) of
         true ->
-            io:format(standard_error, "WARN: no_namespace_for: ~s~n", [FullName]);
+            error({no_namespace, FullName, S});
         false ->
             ok
     end,
diff --git a/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl b/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl
index 743c74e70..4580cc087 100644
--- a/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl
+++ b/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl
@@ -4,12 +4,18 @@
 
 -module(emqx_gbt32960_schema).
 
+-behaviour(hocon_schema).
+
 -include("emqx_gbt32960.hrl").
 -include_lib("hocon/include/hoconsc.hrl").
 -include_lib("typerefl/include/types.hrl").
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, roots/0, fields/1, desc/1]).
+
+namespace() -> "gateway_gbt32960".
+
+roots() -> [].
 
 fields(gbt32960) ->
     [
diff --git a/apps/emqx_gateway_ocpp/src/emqx_ocpp_schema.erl b/apps/emqx_gateway_ocpp/src/emqx_ocpp_schema.erl
index 69fc3aa78..d4609962c 100644
--- a/apps/emqx_gateway_ocpp/src/emqx_ocpp_schema.erl
+++ b/apps/emqx_gateway_ocpp/src/emqx_ocpp_schema.erl
@@ -10,7 +10,11 @@
 -define(DEFAULT_MOUNTPOINT, <<"ocpp/">>).
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, roots/0, fields/1, desc/1]).
+
+namespace() -> "gateway_ocpp".
+
+roots() -> [].
 
 fields(ocpp) ->
     [
diff --git a/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl b/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl
index 94e07ba7a..2b3f7febc 100644
--- a/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl
+++ b/apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl
@@ -24,6 +24,7 @@
 }).
 
 -export([
+    namespace/0,
     roots/0,
     fields/1,
     desc/1
@@ -37,6 +38,9 @@
 
 -define(CONNECTOR_TYPE, pgsql).
 
+namespace() ->
+    "connector_postgres".
+
 roots() ->
     [].