From 1aa82992616ad848539a533a5cd20ba6f9071e5a Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 25 Mar 2022 16:54:23 +0100 Subject: [PATCH] style: erlfmt lib-ee/emqx_enterprise_conf --- lib-ee/emqx_enterprise_conf/rebar.config | 2 ++ .../src/emqx_enterprise_conf.app.src | 26 ++++++++--------- .../src/emqx_enterprise_conf_schema.erl | 14 ++++----- .../emqx_enterprise_conf_schema_SUITE.erl | 29 ++++++++++++------- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/lib-ee/emqx_enterprise_conf/rebar.config b/lib-ee/emqx_enterprise_conf/rebar.config index 2656fd554..53ee79c85 100644 --- a/lib-ee/emqx_enterprise_conf/rebar.config +++ b/lib-ee/emqx_enterprise_conf/rebar.config @@ -1,2 +1,4 @@ {erl_opts, [debug_info]}. {deps, []}. + +{project_plugins, [erlfmt]}. diff --git a/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf.app.src b/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf.app.src index 9d8b5de68..37cb78b54 100644 --- a/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf.app.src +++ b/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf.app.src @@ -1,14 +1,14 @@ -{application, emqx_enterprise_conf, - [{description, "EMQX Enterprise configuration schema"}, - {vsn, "0.1.0"}, - {registered, []}, - {applications, - [kernel, - stdlib - ]}, - {env,[]}, - {modules, []}, +{application, emqx_enterprise_conf, [ + {description, "EMQX Enterprise configuration schema"}, + {vsn, "0.1.0"}, + {registered, []}, + {applications, [ + kernel, + stdlib + ]}, + {env, []}, + {modules, []}, - {licenses, ["Apache 2.0"]}, - {links, []} - ]}. + {licenses, ["Apache 2.0"]}, + {links, []} +]}. diff --git a/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf_schema.erl b/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf_schema.erl index a86fb891e..21d5d276c 100644 --- a/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf_schema.erl +++ b/lib-ee/emqx_enterprise_conf/src/emqx_enterprise_conf_schema.erl @@ -8,19 +8,19 @@ -export([namespace/0, roots/0, fields/1, translations/0, translation/1]). --define(EE_SCHEMA_MODULES, [emqx_license_schema - ]). +-define(EE_SCHEMA_MODULES, [emqx_license_schema]). namespace() -> emqx_conf_schema:namespace(). roots() -> lists:foldl( - fun(Module, Roots) -> - Roots ++ Module:roots() - end, - emqx_conf_schema:roots(), - ?EE_SCHEMA_MODULES). + fun(Module, Roots) -> + Roots ++ Module:roots() + end, + emqx_conf_schema:roots(), + ?EE_SCHEMA_MODULES + ). fields(Name) -> emqx_conf_schema:fields(Name). diff --git a/lib-ee/emqx_enterprise_conf/test/emqx_enterprise_conf_schema_SUITE.erl b/lib-ee/emqx_enterprise_conf/test/emqx_enterprise_conf_schema_SUITE.erl index fb7c67729..396faa4f5 100644 --- a/lib-ee/emqx_enterprise_conf/test/emqx_enterprise_conf_schema_SUITE.erl +++ b/lib-ee/emqx_enterprise_conf/test/emqx_enterprise_conf_schema_SUITE.erl @@ -19,8 +19,9 @@ all() -> t_namespace(_Config) -> ?assertEqual( - emqx_conf_schema:namespace(), - emqx_enterprise_conf_schema:namespace()). + emqx_conf_schema:namespace(), + emqx_enterprise_conf_schema:namespace() + ). t_roots(_Config) -> BaseRoots = emqx_conf_schema:roots(), @@ -28,19 +29,25 @@ t_roots(_Config) -> ?assertEqual([], BaseRoots -- EnterpriseRoots), - ?assert(lists:any( - fun({license, _}) -> true; - (_) -> false - end, - EnterpriseRoots)). + ?assert( + lists:any( + fun + ({license, _}) -> true; + (_) -> false + end, + EnterpriseRoots + ) + ). t_fields(_Config) -> ?assertEqual( - emqx_conf_schema:fields("node"), - emqx_enterprise_conf_schema:fields("node")). + emqx_conf_schema:fields("node"), + emqx_enterprise_conf_schema:fields("node") + ). t_translations(_Config) -> [Root | _] = emqx_enterprise_conf_schema:translations(), ?assertEqual( - emqx_conf_schema:translation(Root), - emqx_enterprise_conf_schema:translation(Root)). + emqx_conf_schema:translation(Root), + emqx_enterprise_conf_schema:translation(Root) + ).