From 6a83cf3f3543db22b98e3ab49fbbd53e7b27c1dd Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Wed, 27 Jan 2021 22:52:46 +0800 Subject: [PATCH] chore(format): format some code --- .github/workflows/run_cts_tests.yaml | 6 +-- .../src/emqx_acl_mnesia_api.erl | 4 +- .../src/emqx_acl_mnesia_cli.erl | 2 +- .../emqx_auth_mnesia/src/emqx_auth_mnesia.erl | 8 ++-- .../src/emqx_auth_mnesia_api.erl | 4 +- .../priv/emqx_auth_mongo.schema | 14 ++---- apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf | 12 +++--- .../priv/emqx_auth_mysql.schema | 43 +++++++++---------- apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf | 16 ++----- .../priv/emqx_auth_pgsql.schema | 10 +---- .../src/emqx_auth_pgsql_cli.erl | 5 ++- apps/emqx_auth_redis/etc/emqx_auth_redis.conf | 2 +- .../priv/emqx_auth_redis.schema | 32 ++++++++------ apps/emqx_lua_hook/src/emqx_lua_hook.erl | 6 +-- apps/emqx_management/src/emqx_mgmt_auth.erl | 4 +- .../test/props/emqx_sn_proper_types.erl | 1 - .../emqx_sn/test/props/prop_emqx_sn_frame.erl | 1 - .../test/emqx_web_hook_SUITE.erl | 2 +- 18 files changed, 77 insertions(+), 95 deletions(-) diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml index df8e0f1d8..c46434242 100644 --- a/.github/workflows/run_cts_tests.yaml +++ b/.github/workflows/run_cts_tests.yaml @@ -133,9 +133,9 @@ jobs: run: | docker-compose -f .ci/compatibility_tests/docker-compose-mysql-tls.yaml up -d sed -i 's|^[#[:space:]]*auth.mysql.ssl[[:space:]]*=.*|auth.mysql.ssl = on|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf - sed -i 's|^[#[:space:]]*auth.mysql.cacertfile[[:space:]]*=.*|auth.mysql.cacertfile = /emqx/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/ca.pem|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf - sed -i 's|^[#[:space:]]*auth.mysql.certfile[[:space:]]*=.*|auth.mysql.certfile = /emqx/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/client-cert.pem|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf - sed -i 's|^[#[:space:]]*auth.mysql.keyfile[[:space:]]*=.*|auth.mysql.keyfile = /emqx/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/client-key.pem|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf + # sed -i 's|^[#[:space:]]*auth.mysql.ssl.cacertfile[[:space:]]*=.*|auth.mysql.ssl.cacertfile = /emqx/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/ca.pem|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf + # sed -i 's|^[#[:space:]]*auth.mysql.ssl.certfile[[:space:]]*=.*|auth.mysql.ssl.certfile = /emqx/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/client-cert.pem|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf + # sed -i 's|^[#[:space:]]*auth.mysql.ssl.keyfile[[:space:]]*=.*|auth.mysql.ssl.keyfile = /emqx/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/client-key.pem|g' apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf - name: setup env: MYSQL_TAG: ${{ matrix.mysql_tag }} diff --git a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl index fbf1089e8..38087135f 100644 --- a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl +++ b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_api.erl @@ -197,10 +197,10 @@ validate([K|Keys], [V|Values]) -> do_validation(login, all) -> true; do_validation(login, {clientid, V}) when is_binary(V) - andalso byte_size(V) > 0-> + andalso byte_size(V) > 0 -> true; do_validation(login, {username, V}) when is_binary(V) - andalso byte_size(V) > 0-> + andalso byte_size(V) > 0 -> true; do_validation(topic, V) when is_binary(V) andalso byte_size(V) > 0 -> diff --git a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl index 3ac50cf21..ae4fcee1f 100644 --- a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl +++ b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl @@ -36,7 +36,7 @@ %%-------------------------------------------------------------------- %% @doc Add Acls --spec(add_acl(login() |all, emqx_topic:topic(), pub | sub| pubsub, allow | deny) -> +-spec(add_acl(login() | all, emqx_topic:topic(), pub | sub | pubsub, allow | deny) -> ok | {error, any()}). add_acl(Login, Topic, Action, Access) -> Acls = #?TABLE{ diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl index 7da78a998..45dbd4573 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl @@ -33,7 +33,7 @@ ]). init(#{clientid_list := ClientidList, username_list := UsernameList}) -> - ok = ekka_mnesia:create_table(emqx_user, [ + ok = ekka_mnesia:create_table(?TABLE, [ {disc_copies, [node()]}, {attributes, record_info(fields, emqx_user)}, {storage_properties, [{ets, [{read_concurrency, true}]}]}]), @@ -41,7 +41,7 @@ init(#{clientid_list := ClientidList, username_list := UsernameList}) -> || {Clientid, Password} <- ClientidList], _ = [ add_default_user({{username, iolist_to_binary(Username)}, iolist_to_binary(Password)}) || {Username, Password} <- UsernameList], - ok = ekka_mnesia:copy_table(emqx_user, disc_copies). + ok = ekka_mnesia:copy_table(?TABLE, disc_copies). %% @private add_default_user({Login, Password}) when is_tuple(Login) -> @@ -55,8 +55,8 @@ check(ClientInfo = #{ clientid := Clientid , password := NPassword }, AuthResult, #{hash_type := HashType}) -> Username = maps:get(username, ClientInfo, undefined), - MatchSpec = ets:fun2ms(fun({?TABLE, {clientid, X }, Password, InterTime}) when X =:= Clientid-> Password; - ({?TABLE, {username, X }, Password, InterTime}) when X =:= Username andalso X =/= undefined -> Password + MatchSpec = ets:fun2ms(fun({?TABLE, {clientid, X}, Password, InterTime}) when X =:= Clientid-> Password; + ({?TABLE, {username, X}, Password, InterTime}) when X =:= Username andalso X =/= undefined -> Password end), case ets:select(?TABLE, MatchSpec) of [] -> diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl index e80971c6e..049af79ad 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl @@ -128,7 +128,7 @@ add_clientid(_Bindings, Params) -> Re = do_add_clientid(Params), case Re of ok -> return(ok); - {error, Error} -> {error, format_msg(Error)} + {error, Error} -> return({error, format_msg(Error)}) end end. @@ -177,7 +177,7 @@ add_username(_Bindings, Params) -> false -> case do_add_username(Params) of ok -> return(ok); - {error, Error} -> {error, format_msg(Error)} + {error, Error} -> return({error, format_msg(Error)}) end end. diff --git a/apps/emqx_auth_mongo/priv/emqx_auth_mongo.schema b/apps/emqx_auth_mongo/priv/emqx_auth_mongo.schema index 15668ca5b..bef569306 100644 --- a/apps/emqx_auth_mongo/priv/emqx_auth_mongo.schema +++ b/apps/emqx_auth_mongo/priv/emqx_auth_mongo.schema @@ -23,12 +23,10 @@ %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 {mapping, "auth.mongo.login", "emqx_auth_mongo.server", [ - {default, ""}, {datatype, string} ]}. {mapping, "auth.mongo.username", "emqx_auth_mongo.server", [ - {default, ""}, {datatype, string} ]}. @@ -100,7 +98,7 @@ Pool = cuttlefish:conf_get("auth.mongo.pool", Conf), %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 Login = cuttlefish:conf_get("auth.mongo.username", Conf, - cuttlefish:conf_get("auth.mongo.login", Conf) + cuttlefish:conf_get("auth.mongo.login", Conf, "") ), Passwd = cuttlefish:conf_get("auth.mongo.password", Conf), DB = cuttlefish:conf_get("auth.mongo.database", Conf), @@ -131,17 +129,11 @@ {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}]) end, - %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 - GenSsl = case cuttlefish:conf_get("auth.mongo.ssl.cacertfile", Conf, undefined) of - undefined -> [{ssl, true}, {ssl_opts, SslOpts("auth.mongo.ssl_opts")}]; - _ -> [{ssl, true}, {ssl_opts, SslOpts("auth.mongo.ssl")}] - end, - %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 Ssl = case cuttlefish:conf_get("auth.mongo.ssl", Conf) of - on -> GenSsl; + on -> [{ssl, true}, {ssl_opts, SslOpts("auth.mongo.ssl")}]; off -> []; - true -> GenSsl; + true -> [{ssl, true}, {ssl_opts, SslOpts("auth.mongo.ssl_opts")}]; false -> [] end, diff --git a/apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf b/apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf index af68134cb..d367c2edc 100644 --- a/apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf +++ b/apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf @@ -17,12 +17,12 @@ auth.mysql.pool = 8 ## MySQL username. ## ## Value: String -# auth.mysql.username = +#auth.mysql.username = ## MySQL password. ## ## Value: String -# auth.mysql.password = +#auth.mysql.password = ## MySQL database. ## @@ -98,19 +98,19 @@ auth.mysql.acl_query = select allow, ipaddr, username, clientid, access, topic f ## Mysql ssl configuration. ## ## Value: on | off -## auth.mysql.ssl = off +#auth.mysql.ssl = off ## CA certificate. ## ## Value: File -# auth.mysql.ssl.cacertfile = /path/to/ca.pem +#auth.mysql.ssl.cacertfile = /path/to/ca.pem ## Client ssl certificate. ## ## Value: File -## auth.mysql.ssl.certfile = path to your clientcert file +#auth.mysql.ssl.certfile = /path/to/your/clientcert.pem ## Client ssl keyfile. ## ## Value: File -## auth.mysql.ssl.keyfile = path to your clientkey file +#auth.mysql.ssl.keyfile = /path/to/your/clientkey.pem diff --git a/apps/emqx_auth_mysql/priv/emqx_auth_mysql.schema b/apps/emqx_auth_mysql/priv/emqx_auth_mysql.schema index 8aacfd280..8f9c069c4 100644 --- a/apps/emqx_auth_mysql/priv/emqx_auth_mysql.schema +++ b/apps/emqx_auth_mysql/priv/emqx_auth_mysql.schema @@ -36,23 +36,19 @@ ]}. {mapping, "auth.mysql.ssl.cafile", "emqx_auth_mysql.server", [ - {default, ""}, {datatype, string} ]}. {mapping, "auth.mysql.ssl.cacertfile", "emqx_auth_mysql.server", [ - {default, ""}, {datatype, string} ]}. %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 {mapping, "auth.mysql.ssl.certfile", "emqx_auth_mysql.server", [ - {default, ""}, {datatype, string} ]}. {mapping, "auth.mysql.ssl.keyfile", "emqx_auth_mysql.server", [ - {default, ""}, {datatype, string} ]}. @@ -78,28 +74,31 @@ end end, Options = [{pool_size, Pool}, - {auto_reconnect, 1}, - {host, MyHost}, - {port, MyPort}, - {user, Username}, - {password, Passwd}, - {database, DB}, - {encoding, utf8}, - {query_timeout, Timeout}, - {keep_alive, true}], + {auto_reconnect, 1}, + {host, MyHost}, + {port, MyPort}, + {user, Username}, + {password, Passwd}, + {database, DB}, + {encoding, utf8}, + {query_timeout, Timeout}, + {keep_alive, true}], + Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end, Options1 = case cuttlefish:conf_get("auth.mysql.ssl", Conf) of true -> %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 - CA = cuttlefish:conf_get("auth.mysql.ssl.cacertfile", Conf, - cuttlefish:conf_get("auth.mysql.ssl.cafile", Conf) - ), - Cert = cuttlefish:conf_get("auth.mysql.ssl.certfile", Conf), - Key = cuttlefish:conf_get("auth.mysql.ssl.keyfile", Conf), - Options ++ [{ssl, {server_name_indication, disable}, - {cacertfile, CA}, - {certfile, Cert}, - {keyfile, Key}}]; + CA = cuttlefish:conf_get( + "auth.mysql.ssl.cacertfile", Conf, + cuttlefish:conf_get("auth.mysql.ssl.cafile", Conf, undefined) + ), + Cert = cuttlefish:conf_get("auth.mysql.ssl.certfile", Conf, undefined), + Key = cuttlefish:conf_get("auth.mysql.ssl.keyfile", Conf, undefined), + Options ++ [{ssl, Filter([{server_name_indication, disable}, + {cacertfile, CA}, + {certfile, Cert}, + {keyfile, Key}]) + }]; _ -> Options end, diff --git a/apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf b/apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf index 2c8454358..ef8e7533a 100644 --- a/apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf +++ b/apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf @@ -45,30 +45,22 @@ auth.pgsql.ssl = off ## Example: ## tlsv1.1,tlsv1.2,tlsv1.3 ## -## auth.pgsql.ssl_opts.tls_versions = tlsv1.2 - -## TLS version -## You can configure multi-version use "," split, -## default value is :tlsv1.2 -## Example: -## tlsv1.1,tlsv1.2,tlsv1.3 -## -## auth.pgsql.ssl.tls_versions = tlsv1.2 +#auth.pgsql.ssl.tls_versions = tlsv1.2 ## SSL keyfile. ## ## Value: File -## auth.pgsql.ssl.keyfile = +#auth.pgsql.ssl.keyfile = ## SSL certfile. ## ## Value: File -## auth.pgsql.ssl.certfile = +#auth.pgsql.ssl.certfile = ## SSL cacertfile. ## ## Value: File -## auth.pgsql.ssl.cacertfile = +#auth.pgsql.ssl.cacertfile = ## Authentication query. ## diff --git a/apps/emqx_auth_pgsql/priv/emqx_auth_pgsql.schema b/apps/emqx_auth_pgsql/priv/emqx_auth_pgsql.schema index 3d3e1fb5e..859495a60 100644 --- a/apps/emqx_auth_pgsql/priv/emqx_auth_pgsql.schema +++ b/apps/emqx_auth_pgsql/priv/emqx_auth_pgsql.schema @@ -97,17 +97,11 @@ ||Value <- string:tokens(cuttlefish:conf_get(Prefix ++ ".tls_versions", Conf), " ,")]}}]) end, - %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 - GenSsl = case cuttlefish:conf_get("auth.pgsql.ssl.cacertfile", Conf, undefined) of - undefined -> [{ssl, true}, {ssl_opts, SslOpts("auth.pgsql.ssl_opts")}]; - _ -> [{ssl, true}, {ssl_opts, SslOpts("auth.pgsql.ssl")}] - end, - %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 Ssl = case cuttlefish:conf_get("auth.pgsql.ssl", Conf) of - on -> GenSsl; + on -> [{ssl, true}, {ssl_opts, SslOpts("auth.pgsql.ssl")}]; off -> []; - true -> GenSsl; + true -> [{ssl, true}, {ssl_opts, SslOpts("auth.pgsql.ssl_opts")}]; false -> [] end, diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl index f5a835867..5b9dbd24a 100644 --- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl +++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl @@ -29,7 +29,10 @@ , equery/3 ]). --type client_info() :: #{username:=_, clientid:=_, peerhost:=_, _=>_}. +-type client_info() :: #{username := _, + clientid := _, + peerhost := _, + _ => _}. %%-------------------------------------------------------------------- %% Avoid SQL Injection: Parse SQL to Parameter Query. diff --git a/apps/emqx_auth_redis/etc/emqx_auth_redis.conf b/apps/emqx_auth_redis/etc/emqx_auth_redis.conf index d56759c84..77b247a06 100644 --- a/apps/emqx_auth_redis/etc/emqx_auth_redis.conf +++ b/apps/emqx_auth_redis/etc/emqx_auth_redis.conf @@ -103,7 +103,7 @@ auth.redis.acl_cmd = HGETALL mqtt_acl:%u ## CA certificate. ## ## Value: File -# auth.redis.ssl.cacertfile = path/to/your/cafile.pem +#auth.redis.ssl.cacertfile = path/to/your/cafile.pem ## Client ssl certificate. ## diff --git a/apps/emqx_auth_redis/priv/emqx_auth_redis.schema b/apps/emqx_auth_redis/priv/emqx_auth_redis.schema index 93da345cc..070f306af 100644 --- a/apps/emqx_auth_redis/priv/emqx_auth_redis.schema +++ b/apps/emqx_auth_redis/priv/emqx_auth_redis.schema @@ -39,18 +39,14 @@ ]}. {mapping, "auth.redis.ssl.cacertfile", "emqx_auth_redis.options", [ - {default, ""}, {datatype, string} ]}. -%% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 {mapping, "auth.redis.ssl.certfile", "emqx_auth_redis.options", [ - {default, ""}, {datatype, string} ]}. {mapping, "auth.redis.ssl.keyfile", "emqx_auth_redis.options", [ - {default, ""}, {datatype, string} ]}. @@ -74,19 +70,27 @@ {translation, "emqx_auth_redis.options", fun(Conf) -> Ssl = cuttlefish:conf_get("auth.redis.ssl", Conf, false), + Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end, case Ssl of true -> %% FIXME: compatible with 4.0-4.2 version format, plan to delete in 5.0 - Prefix = case cuttlefish:conf_get("auth.redis.ssl.cacertfile", Conf, undefined) of - undefined -> "auth.redis"; - _ -> "auth.redis.ssl" - end, - CA = cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf), - Cert = cuttlefish:conf_get(Prefix ++ ".certfile", Conf), - Key = cuttlefish:conf_get(Prefix ++ ".keyfile", Conf), - [{options, [{ssl_options, [{cacertfile, CA}, - {certfile, Cert}, - {keyfile, Key}]}]}]; + CA = cuttlefish:conf_get( + "auth.redis.ssl.cacertfile", Conf, + cuttlefish:conf_get("auth.redis.cacertfile", Conf, undefined) + ), + Cert = cuttlefish:conf_get( + "auth.redis.ssl.certfile", Conf, + cuttlefish:conf_get("auth.redis.certfile", Conf, undefined) + ), + Key = cuttlefish:conf_get( + "auth.redis.ssl.keyfile", Conf, + cuttlefish:conf_get("auth.redis.keyfile", Conf, undefined) + ), + [{options, [{ssl_options, + Filter([{cacertfile, CA}, + {certfile, Cert}, + {keyfile, Key}]) + }]}]; _ -> [{options, []}] end end}. diff --git a/apps/emqx_lua_hook/src/emqx_lua_hook.erl b/apps/emqx_lua_hook/src/emqx_lua_hook.erl index ab26e94c0..40fd26ab7 100644 --- a/apps/emqx_lua_hook/src/emqx_lua_hook.erl +++ b/apps/emqx_lua_hook/src/emqx_lua_hook.erl @@ -192,8 +192,8 @@ do_register_hooks(Hook, ScriptName, _St) -> ?LOG(error, "Discard unknown hook type ~p from ~p", [Hook, ScriptName]). do_unloadall(Scripts) -> - lists:foreach(fun do_unload/1, Scripts), - ok. + lists:foreach(fun do_unload/1, Scripts). do_unload(Script) -> - emqx_lua_script:unregister_hooks(Script), ok. + emqx_lua_script:unregister_hooks(Script), + ok. diff --git a/apps/emqx_management/src/emqx_mgmt_auth.erl b/apps/emqx_management/src/emqx_mgmt_auth.erl index 0abb2f43a..3c3576578 100644 --- a/apps/emqx_management/src/emqx_mgmt_auth.erl +++ b/apps/emqx_management/src/emqx_mgmt_auth.erl @@ -99,11 +99,11 @@ add_app(AppId, Name, Secret, Desc, Status, Expired) when is_binary(AppId) -> AddFun = fun() -> case mnesia:wread({mqtt_app, AppId}) of [] -> mnesia:write(App); - _ -> mnesia:abort(alread_existed), ok + _ -> mnesia:abort(alread_existed) end end, case mnesia:transaction(AddFun) of - {atomic, _} -> {ok, Secret1}; + {atomic, ok} -> {ok, Secret1}; {aborted, Reason} -> {error, Reason} end. diff --git a/apps/emqx_sn/test/props/emqx_sn_proper_types.erl b/apps/emqx_sn/test/props/emqx_sn_proper_types.erl index 976da9413..f91684c8d 100644 --- a/apps/emqx_sn/test/props/emqx_sn_proper_types.erl +++ b/apps/emqx_sn/test/props/emqx_sn_proper_types.erl @@ -16,7 +16,6 @@ -module(emqx_sn_proper_types). -%-include("emqx_sn.hrl"). -include_lib("emqx_sn/include/emqx_sn.hrl"). -include_lib("proper/include/proper.hrl"). diff --git a/apps/emqx_sn/test/props/prop_emqx_sn_frame.erl b/apps/emqx_sn/test/props/prop_emqx_sn_frame.erl index 50f198fad..ae82feb8a 100644 --- a/apps/emqx_sn/test/props/prop_emqx_sn_frame.erl +++ b/apps/emqx_sn/test/props/prop_emqx_sn_frame.erl @@ -16,7 +16,6 @@ -module(prop_emqx_sn_frame). -%-include("emqx_sn.hrl"). -include_lib("emqx_sn/include/emqx_sn.hrl"). -include_lib("proper/include/proper.hrl"). diff --git a/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl b/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl index 94ea212ec..cba87e0e0 100644 --- a/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl +++ b/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl @@ -68,7 +68,7 @@ set_special_configs_https(_) -> Path = emqx_ct_helpers:deps_path(emqx_web_hook, "test/emqx_web_hook_SUITE_data/"), SslOpts = [{keyfile, Path ++ "/client-key.pem"}, {certfile, Path ++ "/client-cert.pem"}, - {cafile, Path ++ "/ca.pem"}], + {cacertfile, Path ++ "/ca.pem"}], application:set_env(emqx_web_hook, ssl, true), application:set_env(emqx_web_hook, ssloptions, SslOpts), application:set_env(emqx_web_hook, url, "https://127.0.0.1:8888").