From 10b110447cea66165125969c461c2ceb656e86f5 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 4 Jan 2022 15:30:24 +0800 Subject: [PATCH] chore(exhook): change root name emqx_exhook > exhook --- apps/emqx_exhook/etc/emqx_exhook.conf | 2 +- apps/emqx_exhook/src/emqx_exhook_api.erl | 8 ++++---- apps/emqx_exhook/src/emqx_exhook_mgr.erl | 8 ++++---- apps/emqx_exhook/src/emqx_exhook_schema.erl | 6 +++--- apps/emqx_exhook/test/emqx_exhook_SUITE.erl | 10 +++++----- apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl | 15 ++++++++------- apps/emqx_exhook/test/props/prop_exhook_hooks.erl | 11 ++++++----- .../test/emqx_mgmt_api_test_util.erl | 2 +- 8 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apps/emqx_exhook/etc/emqx_exhook.conf b/apps/emqx_exhook/etc/emqx_exhook.conf index 8769e9a2d..fcdb0de96 100644 --- a/apps/emqx_exhook/etc/emqx_exhook.conf +++ b/apps/emqx_exhook/etc/emqx_exhook.conf @@ -2,7 +2,7 @@ ## EMQ X Hooks ##==================================================================== -emqx_exhook { +exhook { servers = [ ##{ diff --git a/apps/emqx_exhook/src/emqx_exhook_api.erl b/apps/emqx_exhook/src/emqx_exhook_api.erl index 7de57f724..bd3351616 100644 --- a/apps/emqx_exhook/src/emqx_exhook_api.erl +++ b/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}; diff --git a/apps/emqx_exhook/src/emqx_exhook_mgr.erl b/apps/emqx_exhook/src/emqx_exhook_mgr.erl index 35bbe00a4..d3d429021 100644 --- a/apps/emqx_exhook/src/emqx_exhook_mgr.erl +++ b/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( diff --git a/apps/emqx_exhook/src/emqx_exhook_schema.erl b/apps/emqx_exhook/src/emqx_exhook_schema.erl index 88a61ef1c..a8666798c 100644 --- a/apps/emqx_exhook/src/emqx_exhook_schema.erl +++ b/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 => []})} diff --git a/apps/emqx_exhook/test/emqx_exhook_SUITE.erl b/apps/emqx_exhook/test/emqx_exhook_SUITE.erl index 490e002e3..002900f1e 100644 --- a/apps/emqx_exhook/test/emqx_exhook_SUITE.erl +++ b/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\" + }] } ">>). diff --git a/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl b/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl index f95f2b98c..b82451714 100644 --- a/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl +++ b/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) -> diff --git a/apps/emqx_exhook/test/props/prop_exhook_hooks.erl b/apps/emqx_exhook/test/props/prop_exhook_hooks.erl index 284e2b89b..84999e4a8 100644 --- a/apps/emqx_exhook/test/props/prop_exhook_hooks.erl +++ b/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\" + } + ] } ">>). diff --git a/apps/emqx_management/test/emqx_mgmt_api_test_util.erl b/apps/emqx_management/test/emqx_mgmt_api_test_util.erl index 8dcbfcc5e..42481abcb 100644 --- a/apps/emqx_management/test/emqx_mgmt_api_test_util.erl +++ b/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.