chore(exhook): change root name emqx_exhook > exhook

apps/emqx_exhook/etc/emqx_exhook.conf

@@ -2,7 +2,7 @@
 ## EMQ X Hooks
 ##====================================================================
 
-emqx_exhook {
+exhook {
 
     servers = [
     ##{

apps/emqx_exhook/src/emqx_exhook_api.erl

@@ -146,7 +146,7 @@ exhooks(get, _) ->
     {200, ServerL2};
 
 exhooks(post, #{body := Body}) ->
-    case emqx_exhook_mgr:update_config([emqx_exhook, servers], {add, Body}) of
+    case emqx_exhook_mgr:update_config([exhook, servers], {add, Body}) of
         {ok, Result} ->
             {201, Result};
         {error, Error} ->
@@ -168,7 +168,7 @@ action_with_name(get, #{bindings := #{name := Name}}) ->
     end;
 
 action_with_name(put, #{bindings := #{name := Name}, body := Body}) ->
-    case emqx_exhook_mgr:update_config([emqx_exhook, servers],
+    case emqx_exhook_mgr:update_config([exhook, servers],
                                        {update, Name, Body}) of
         {ok, not_found} ->
             {400, #{code => <<"BAD_REQUEST">>,
@@ -187,7 +187,7 @@ action_with_name(put, #{bindings := #{name := Name}, body := Body}) ->
     end;
 
 action_with_name(delete, #{bindings := #{name := Name}}) ->
-    case emqx_exhook_mgr:update_config([emqx_exhook, servers],
+    case emqx_exhook_mgr:update_config([exhook, servers],
                                        {delete, Name}) of
         {ok, _} ->
             {200};
@@ -200,7 +200,7 @@ action_with_name(delete, #{bindings := #{name := Name}}) ->
 move(post, #{bindings := #{name := Name}, body := Body}) ->
     #{<<"position">> := PositionT, <<"related">> := Related} = Body,
     Position = erlang:binary_to_atom(PositionT),
-    case emqx_exhook_mgr:update_config([emqx_exhook, servers],
+    case emqx_exhook_mgr:update_config([exhook, servers],
                                        {move, Name, Position, Related}) of
         {ok, ok} ->
             {200};

apps/emqx_exhook/src/emqx_exhook_mgr.erl

@@ -108,10 +108,10 @@ lookup(Name) ->
     call({lookup, Name}).
 
 enable(Name) ->
-    update_config([emqx_exhook, servers], {enable, Name, true}).
+    update_config([exhook, servers], {enable, Name, true}).
 
 disable(Name) ->
-    update_config([emqx_exhook, servers], {enable, Name, false}).
+    update_config([exhook, servers], {enable, Name, false}).
 
 server_status(Name) ->
     call({server_status, Name}).
@@ -176,8 +176,8 @@ post_config_update(_KeyPath, UpdateReq, NewConf, _OldConf, _AppEnvs) ->
 
 init([]) ->
     process_flag(trap_exit, true),
-    emqx_conf:add_handler([emqx_exhook, servers], ?MODULE),
-    ServerL = emqx:get_config([emqx_exhook, servers]),
+    emqx_conf:add_handler([exhook, servers], ?MODULE),
+    ServerL = emqx:get_config([exhook, servers]),
     {Waiting, Running, Stopped} = load_all_servers(ServerL),
     Orders = reorder(ServerL),
     {ok, ensure_reload_timer(

apps/emqx_exhook/src/emqx_exhook_schema.erl

@@ -34,11 +34,11 @@
 
 -export([namespace/0, roots/0, fields/1, server_config/0]).
 
-namespace() -> emqx_exhook.
+namespace() -> exhook.
 
-roots() -> [emqx_exhook].
+roots() -> [exhook].
 
-fields(emqx_exhook) ->
+fields(exhook) ->
     [{servers,
       sc(hoconsc:array(ref(server)),
           #{default => []})}

apps/emqx_exhook/test/emqx_exhook_SUITE.erl

@@ -24,11 +24,11 @@
 -define(CLUSTER_RPC_SHARD, emqx_cluster_rpc_shard).
 
 -define(CONF_DEFAULT, <<"
-emqx_exhook
-{servers = [
-            {name = default,
-             url = \"http://127.0.0.1:9000\"
-            }]
+exhook {
+  servers = [
+    { name = default,
+      url = \"http://127.0.0.1:9000\"
+    }]
 }
 ">>).
 

apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl

@@ -27,12 +27,13 @@
 -define(CLUSTER_RPC_SHARD, emqx_cluster_rpc_shard).
 
 -define(CONF_DEFAULT, <<"
-emqx_exhook {servers = [
-                        {name = default,
-                         url = \"http://127.0.0.1:9000\"
-                         }
-                       ]
-            }
+exhook {
+  servers =
+    [ { name = default,
+        url = \"http://127.0.0.1:9000\"
+      }
+    ]
+}
 ">>).
 
 all() ->
@@ -49,7 +50,7 @@ init_per_suite(Config) ->
     _ = emqx_exhook_demo_svr:start(),
     ok = emqx_config:init_load(emqx_exhook_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_exhook]),
-    [Conf] = emqx:get_config([emqx_exhook, servers]),
+    [Conf] = emqx:get_config([exhook, servers]),
     [{template, Conf} | Config].
 
 end_per_suite(Config) ->

apps/emqx_exhook/test/props/prop_exhook_hooks.erl

@@ -31,11 +31,12 @@
         ]).
 
 -define(CONF_DEFAULT, <<"
-emqx_exhook
-{servers = [
-            {name = default,
-             url = \"http://127.0.0.1:9000\"
-            }]
+exhook {
+  servers =
+    [ { name = default,
+        url = \"http://127.0.0.1:9000\"
+      }
+    ]
 }
 ">>).
 

apps/emqx_management/test/emqx_mgmt_api_test_util.erl

@@ -45,7 +45,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.