From a58493f7a41e17fad986d877c9cb816d4fccf5f8 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Thu, 2 Dec 2021 10:10:22 +0800 Subject: [PATCH] test(authz): fix test suite for schema check and app start --- apps/emqx_authz/src/emqx_authz_http.erl | 3 +++ apps/emqx_authz/src/emqx_authz_schema.erl | 6 ++++++ apps/emqx_authz/test/emqx_authz_SUITE.erl | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/emqx_authz/src/emqx_authz_http.erl b/apps/emqx_authz/src/emqx_authz_http.erl index af4e7f742..6d1324c47 100644 --- a/apps/emqx_authz/src/emqx_authz_http.erl +++ b/apps/emqx_authz/src/emqx_authz_http.erl @@ -73,6 +73,9 @@ authorize(Client, PubSub, Topic, ignore end. +parse_url(URL) + when URL =:= undefined -> + #{}; parse_url(URL) -> {ok, URIMap} = emqx_http_lib:uri_parse(URL), case maps:get(query, URIMap, undefined) of diff --git a/apps/emqx_authz/src/emqx_authz_schema.erl b/apps/emqx_authz/src/emqx_authz_schema.erl index 01f601857..4f7788849 100644 --- a/apps/emqx_authz/src/emqx_authz_schema.erl +++ b/apps/emqx_authz/src/emqx_authz_schema.erl @@ -199,6 +199,9 @@ transform_header_name(Headers) -> maps:put(K, V, Acc) end, #{}, Headers). +check_ssl_opts(Conf) + when Conf =:= #{} -> + true; check_ssl_opts(Conf) -> case emqx_authz_http:parse_url(hocon_schema:get_value("config.url", Conf)) of #{scheme := https} -> @@ -210,6 +213,9 @@ check_ssl_opts(Conf) -> ok end. +check_headers(Conf) + when Conf =:= #{} -> + true; check_headers(Conf) -> Method = to_bin(hocon_schema:get_value("config.method", Conf)), Headers = hocon_schema:get_value("config.headers", Conf), diff --git a/apps/emqx_authz/test/emqx_authz_SUITE.erl b/apps/emqx_authz/test/emqx_authz_SUITE.erl index 130e266fb..d965affee 100644 --- a/apps/emqx_authz/test/emqx_authz_SUITE.erl +++ b/apps/emqx_authz/test/emqx_authz_SUITE.erl @@ -36,7 +36,8 @@ init_per_suite(Config) -> meck:expect(emqx_resource, remove, fun(_) -> ok end ), ok = emqx_common_test_helpers:start_apps( - [emqx_conf, emqx_authz], fun set_special_configs/1), + [emqx_connector, emqx_conf, emqx_authz], + fun set_special_configs/1), Config. end_per_suite(_Config) ->