From c0eaa30064502880557970f4c0c57be182c49f96 Mon Sep 17 00:00:00 2001 From: Rory Z Date: Tue, 31 Aug 2021 10:29:28 +0800 Subject: [PATCH] chore(emqx_authz): change api path --- apps/emqx_authz/src/emqx_authz_api.erl | 7 ++--- apps/emqx_authz/test/emqx_authz_api_SUITE.erl | 28 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/apps/emqx_authz/src/emqx_authz_api.erl b/apps/emqx_authz/src/emqx_authz_api.erl index ff5217426..dc8694c3f 100644 --- a/apps/emqx_authz/src/emqx_authz_api.erl +++ b/apps/emqx_authz/src/emqx_authz_api.erl @@ -137,7 +137,6 @@ sources_api() -> } }, put => #{ - description => "Update all sources", requestBody => #{ content => #{ @@ -177,7 +176,7 @@ sources_api() -> } } }, - {"/authorization", Metadata, sources}. + {"/authorization/sources", Metadata, sources}. source_api() -> Metadata = #{ @@ -324,7 +323,7 @@ source_api() -> } } }, - {"/authorization/:type", Metadata, source}. + {"/authorization/sources/:type", Metadata, source}. move_source_api() -> Metadata = #{ @@ -414,7 +413,7 @@ move_source_api() -> } } }, - {"/authorization/:type/move", Metadata, move_source}. + {"/authorization/sources/:type/move", Metadata, move_source}. sources(get, #{query_string := Query}) -> Sources = lists:foldl(fun (#{type := _Type, enable := true, config := #{server := Server} = Config, annotations := #{id := Id}} = Source, AccIn) -> diff --git a/apps/emqx_authz/test/emqx_authz_api_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_SUITE.erl index c8901af77..946b1a30b 100644 --- a/apps/emqx_authz/test/emqx_authz_api_SUITE.erl +++ b/apps/emqx_authz/test/emqx_authz_api_SUITE.erl @@ -149,25 +149,25 @@ set_special_configs(_App) -> %%------------------------------------------------------------------------------ t_api(_) -> - {ok, 200, Result1} = request(get, uri(["authorization"]), []), + {ok, 200, Result1} = request(get, uri(["authorization", "sources"]), []), ?assertEqual([], get_sources(Result1)), lists:foreach(fun(_) -> - {ok, 204, _} = request(post, uri(["authorization"]), ?SOURCE1) + {ok, 204, _} = request(post, uri(["authorization", "sources"]), ?SOURCE1) end, lists:seq(1, 20)), - {ok, 200, Result2} = request(get, uri(["authorization"]), []), + {ok, 200, Result2} = request(get, uri(["authorization", "sources"]), []), ?assertEqual(20, length(get_sources(Result2))), lists:foreach(fun(Page) -> Query = "?page=" ++ integer_to_list(Page) ++ "&&limit=10", - Url = uri(["authorization" ++ Query]), + Url = uri(["authorization/sources" ++ Query]), {ok, 200, Result} = request(get, Url, []), ?assertEqual(10, length(get_sources(Result))) end, lists:seq(1, 2)), - {ok, 204, _} = request(put, uri(["authorization"]), [?SOURCE1, ?SOURCE2, ?SOURCE3, ?SOURCE4]), + {ok, 204, _} = request(put, uri(["authorization", "sources"]), [?SOURCE1, ?SOURCE2, ?SOURCE3, ?SOURCE4]), - {ok, 200, Result3} = request(get, uri(["authorization"]), []), + {ok, 200, Result3} = request(get, uri(["authorization", "sources"]), []), Sources = get_sources(Result3), ?assertMatch([ #{<<"type">> := <<"http">>} , #{<<"type">> := <<"mongo">>} @@ -175,15 +175,15 @@ t_api(_) -> , #{<<"type">> := <<"pgsql">>} ], Sources), - {ok, 204, _} = request(put, uri(["authorization", "http"]), ?SOURCE1#{<<"enable">> := false}), + {ok, 204, _} = request(put, uri(["authorization", "sources", "http"]), ?SOURCE1#{<<"enable">> := false}), - {ok, 200, Result4} = request(get, uri(["authorization", "http"]), []), + {ok, 200, Result4} = request(get, uri(["authorization", "sources", "http"]), []), ?assertMatch(#{<<"type">> := <<"http">>, <<"enable">> := false}, jsx:decode(Result4)), lists:foreach(fun(#{<<"type">> := Type}) -> - {ok, 204, _} = request(delete, uri(["authorization", binary_to_list(Type)]), []) + {ok, 204, _} = request(delete, uri(["authorization", "sources", binary_to_list(Type)]), []) end, Sources), - {ok, 200, Result5} = request(get, uri(["authorization"]), []), + {ok, 200, Result5} = request(get, uri(["authorization", "sources"]), []), ?assertEqual([], get_sources(Result5)), ok. @@ -196,7 +196,7 @@ t_move_source(_) -> , #{type := redis} ], emqx_authz:lookup()), - {ok, 204, _} = request(post, uri(["authorization", "pgsql", "move"]), + {ok, 204, _} = request(post, uri(["authorization", "sources", "pgsql", "move"]), #{<<"position">> => <<"top">>}), ?assertMatch([ #{type := pgsql} , #{type := http} @@ -205,7 +205,7 @@ t_move_source(_) -> , #{type := redis} ], emqx_authz:lookup()), - {ok, 204, _} = request(post, uri(["authorization", "http", "move"]), + {ok, 204, _} = request(post, uri(["authorization", "sources", "http", "move"]), #{<<"position">> => <<"bottom">>}), ?assertMatch([ #{type := pgsql} , #{type := mongo} @@ -214,7 +214,7 @@ t_move_source(_) -> , #{type := http} ], emqx_authz:lookup()), - {ok, 204, _} = request(post, uri(["authorization", "mysql", "move"]), + {ok, 204, _} = request(post, uri(["authorization", "sources", "mysql", "move"]), #{<<"position">> => #{<<"before">> => <<"pgsql">>}}), ?assertMatch([ #{type := mysql} , #{type := pgsql} @@ -223,7 +223,7 @@ t_move_source(_) -> , #{type := http} ], emqx_authz:lookup()), - {ok, 204, _} = request(post, uri(["authorization", "mongo", "move"]), + {ok, 204, _} = request(post, uri(["authorization", "sources", "mongo", "move"]), #{<<"position">> => #{<<"after">> => <<"http">>}}), ?assertMatch([ #{type := mysql} , #{type := pgsql}