From af2868e59869f320444968dc9b737733ff336247 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Tue, 4 Jan 2022 14:23:52 +0800
Subject: [PATCH] chore(dashboard): change root name emqx_dashboard > dashboard

---
 apps/emqx_authn/test/emqx_authn_api_SUITE.erl         | 2 +-
 apps/emqx_dashboard/etc/emqx_dashboard.conf           | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard.erl            | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard_admin.erl      | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard_collection.erl | 4 ++--
 apps/emqx_dashboard/src/emqx_dashboard_middleware.erl | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard_schema.erl     | 4 ++--
 apps/emqx_dashboard/src/emqx_dashboard_token.erl      | 2 +-
 apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/emqx_authn/test/emqx_authn_api_SUITE.erl b/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
index 8a61af36a..63c631b4b 100644
--- a/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
@@ -79,7 +79,7 @@ set_special_configs(emqx_dashboard) ->
             port => 18083
         }]
     },
-    emqx_config:put([emqx_dashboard], Config),
+    emqx_config:put([dashboard], Config),
     ok;
 set_special_configs(_App) ->
     ok.
diff --git a/apps/emqx_dashboard/etc/emqx_dashboard.conf b/apps/emqx_dashboard/etc/emqx_dashboard.conf
index ba2a68eeb..22c090457 100644
--- a/apps/emqx_dashboard/etc/emqx_dashboard.conf
+++ b/apps/emqx_dashboard/etc/emqx_dashboard.conf
@@ -2,7 +2,7 @@
 ## EMQ X Dashboard
 ##--------------------------------------------------------------------
 
-emqx_dashboard {
+dashboard {
     default_username = "admin"
     default_password = "public"
     ## notice: sample_interval should be divisible by 60.
diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl
index fbd6d32eb..a8ec70b1b 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard.erl
@@ -90,7 +90,7 @@ listeners() ->
         Name = listener_name(Protocol, Port),
         RanchOptions = ranch_opts(maps:without([protocol], ListenerOptions)),
         {Name, Protocol, Port, RanchOptions}
-    end || ListenerOptions <- emqx_conf:get([emqx_dashboard, listeners], [])].
+    end || ListenerOptions <- emqx_conf:get([dashboard, listeners], [])].
 
 ranch_opts(RanchOptions) ->
     Keys = [ {ack_timeout, handshake_timeout}
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
index 39e73f659..158c42e6e 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
@@ -229,7 +229,7 @@ add_default_user() ->
     add_default_user(binenv(default_username), binenv(default_password)).
 
 binenv(Key) ->
-    iolist_to_binary(emqx_conf:get([emqx_dashboard, Key], "")).
+    iolist_to_binary(emqx_conf:get([dashboard, Key], "")).
 
 add_default_user(Username, Password) when ?EMPTY_KEY(Username) orelse ?EMPTY_KEY(Password) ->
     {ok, empty};
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_collection.erl b/apps/emqx_dashboard/src/emqx_dashboard_collection.erl
index b125dfa3e..00f9d6d10 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_collection.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_collection.erl
@@ -55,7 +55,7 @@ get_collect() -> gen_server:call(whereis(?MODULE), get_collect).
 init([]) ->
     timer(next_interval(), collect),
     timer(get_today_remaining_seconds(), clear_expire_data),
-    ExpireInterval = emqx_conf:get([emqx_dashboard, monitor, interval], ?EXPIRE_INTERVAL),
+    ExpireInterval = emqx_conf:get([dashboard, monitor, interval], ?EXPIRE_INTERVAL),
     State = #{
         count => count(),
         expire_interval => ExpireInterval,
@@ -75,7 +75,7 @@ next_interval() ->
     (1000 * interval()) - (erlang:system_time(millisecond) rem (1000 * interval())) - 1.
 
 interval() ->
-    emqx_conf:get([?APP, sample_interval], ?DEFAULT_INTERVAL).
+    emqx_conf:get([dashboard, sample_interval], ?DEFAULT_INTERVAL).
 
 count() ->
     60 div interval().
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_middleware.erl b/apps/emqx_dashboard/src/emqx_dashboard_middleware.erl
index 7c22ee3ef..77b6dbdd0 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_middleware.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_middleware.erl
@@ -21,7 +21,7 @@
 -export([execute/2]).
 
 execute(Req, Env) ->
-    CORS = emqx_conf:get([emqx_dashboard, cors], false),
+    CORS = emqx_conf:get([dashboard, cors], false),
     case CORS andalso cowboy_req:header(<<"origin">>, Req, undefined) of
         false ->
             {ok, Req, Env};
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
index cd1bcf0d8..fddf8ca62 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
@@ -22,9 +22,9 @@
         ,namespace/0]).
 
 namespace() -> <<"dashboard">>.
-roots() -> ["emqx_dashboard"].
+roots() -> ["dashboard"].
 
-fields("emqx_dashboard") ->
+fields("dashboard") ->
     [ {listeners, hoconsc:array(hoconsc:union([hoconsc:ref(?MODULE, "http"),
                                                hoconsc:ref(?MODULE, "https")]))}
     , {default_username, fun default_username/1}
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_token.erl b/apps/emqx_dashboard/src/emqx_dashboard_token.erl
index e8c9f8619..515a59cae 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_token.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_token.erl
@@ -163,7 +163,7 @@ jwt_expiration_time() ->
     erlang:system_time(millisecond) + token_ttl().
 
 token_ttl() ->
-    emqx_conf:get([emqx_dashboard, token_expired_time], ?EXPTIME).
+    emqx_conf:get([dashboard, token_expired_time], ?EXPTIME).
 
 format(Token, Username, ExpTime) ->
     #?ADMIN_JWT{
diff --git a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
index 11d8e8052..9fa20a6d8 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
@@ -94,7 +94,7 @@ set_special_configs(emqx_dashboard) ->
                default_username => <<"admin">>,
                default_password => <<"public">>
               },
-    emqx_config:put([emqx_dashboard], Config),
+    emqx_config:put([dashboard], Config),
     ok;
 set_special_configs(_) ->
     ok.