From fae91d72f294dd50f5294a88756ba8c3f7fca144 Mon Sep 17 00:00:00 2001
From: EMQ-YangM <yangm@emqx.io>
Date: Fri, 11 Feb 2022 17:50:56 +0800
Subject: [PATCH] fix(emqx_authz): fix function 'create_resource'

---
 apps/emqx_authz/include/emqx_authz.hrl                | 2 ++
 apps/emqx_authz/src/emqx_authz_postgresql.erl         | 1 +
 apps/emqx_authz/src/emqx_authz_utils.erl              | 7 +++----
 apps/emqx_authz/test/emqx_authz_SUITE.erl             | 2 +-
 apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/emqx_authz/include/emqx_authz.hrl b/apps/emqx_authz/include/emqx_authz.hrl
index 3e1c119be..e71b67284 100644
--- a/apps/emqx_authz/include/emqx_authz.hrl
+++ b/apps/emqx_authz/include/emqx_authz.hrl
@@ -71,3 +71,5 @@
                                  , limit => 100
                                  , count => 1
                                  }).
+
+-define(RESOURCE_GROUP, <<"emqx_authz">>).
\ No newline at end of file
diff --git a/apps/emqx_authz/src/emqx_authz_postgresql.erl b/apps/emqx_authz/src/emqx_authz_postgresql.erl
index 0da8caaff..936cfc7e6 100644
--- a/apps/emqx_authz/src/emqx_authz_postgresql.erl
+++ b/apps/emqx_authz/src/emqx_authz_postgresql.erl
@@ -53,6 +53,7 @@ init(#{query := SQL0} = Source) ->
     ResourceID = emqx_authz_utils:make_resource_id(emqx_connector_pgsql),
     case emqx_resource:create_local(
             ResourceID,
+            ?RESOURCE_GROUP,
             emqx_connector_pgsql,
             Source#{named_queries => #{ResourceID => SQL}}) of
         {ok, _} ->
diff --git a/apps/emqx_authz/src/emqx_authz_utils.erl b/apps/emqx_authz/src/emqx_authz_utils.erl
index 2a60f7659..c0a8206c6 100644
--- a/apps/emqx_authz/src/emqx_authz_utils.erl
+++ b/apps/emqx_authz/src/emqx_authz_utils.erl
@@ -17,6 +17,7 @@
 -module(emqx_authz_utils).
 
 -include_lib("emqx/include/emqx_placeholder.hrl").
+-include_lib("emqx_authz.hrl").
 
 -export([ cleanup_resources/0
         , make_resource_id/1
@@ -28,15 +29,13 @@
         , render_sql_params/2
         ]).
 
--define(RESOURCE_GROUP, <<"emqx_authz">>).
-
 %%------------------------------------------------------------------------------
 %% APIs
 %%------------------------------------------------------------------------------
 
 create_resource(Module, Config) ->
     ResourceID = make_resource_id(Module),
-    case emqx_resource:create_local(ResourceID, Module, Config) of
+    case emqx_resource:create_local(ResourceID, ?RESOURCE_GROUP, Module, Config) of
         {ok, already_created} -> {ok, ResourceID};
         {ok, _} -> {ok, ResourceID};
         {error, Reason} -> {error, Reason}
@@ -49,7 +48,7 @@ cleanup_resources() ->
 
 make_resource_id(Name) ->
     NameBin = bin(Name),
-    emqx_resource:generate_id(?RESOURCE_GROUP, NameBin).
+    emqx_resource:generate_id(NameBin).
 
 update_config(Path, ConfigRequest) ->
     emqx_conf:update(Path, ConfigRequest, #{rawconf_with_defaults => true,
diff --git a/apps/emqx_authz/test/emqx_authz_SUITE.erl b/apps/emqx_authz/test/emqx_authz_SUITE.erl
index 5a9f6d97e..638da1416 100644
--- a/apps/emqx_authz/test/emqx_authz_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_SUITE.erl
@@ -31,7 +31,7 @@ groups() ->
 
 init_per_suite(Config) ->
     meck:new(emqx_resource, [non_strict, passthrough, no_history, no_link]),
-    meck:expect(emqx_resource, create_local, fun(_, _, _) -> {ok, meck_data} end),
+    meck:expect(emqx_resource, create_local, fun(_, _, _, _) -> {ok, meck_data} end),
     meck:expect(emqx_resource, remove_local, fun(_) -> ok end),
     meck:expect(emqx_resource, create_dry_run_local, fun(_, _) -> ok end),
 
diff --git a/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
index 03df47eac..6c4e093aa 100644
--- a/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
@@ -96,7 +96,7 @@ groups() ->
 
 init_per_suite(Config) ->
     meck:new(emqx_resource, [non_strict, passthrough, no_history, no_link]),
-    meck:expect(emqx_resource, create_local, fun(_, _, _) -> {ok, meck_data} end),
+    meck:expect(emqx_resource, create_local, fun(_, _, _, _) -> {ok, meck_data} end),
     meck:expect(emqx_resource, create_dry_run_local,
                 fun(emqx_connector_mysql, _) -> ok;
                    (emqx_connector_mongo, _) -> ok;