From f0c2b53868f06e52d9ec6e27da687cd42823dcfe Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Mon, 22 Aug 2022 10:31:26 +0800
Subject: [PATCH] fix(bpapi): make bpapi static_checks happy

---
 .../src/emqx_connector_schema_lib.erl          |  2 +-
 apps/emqx_resource/include/emqx_resource.hrl   |  3 ++-
 .../src/emqx_resource_manager.erl              | 18 +-----------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/apps/emqx_connector/src/emqx_connector_schema_lib.erl b/apps/emqx_connector/src/emqx_connector_schema_lib.erl
index f37640538..53643c9f9 100644
--- a/apps/emqx_connector/src/emqx_connector_schema_lib.erl
+++ b/apps/emqx_connector/src/emqx_connector_schema_lib.erl
@@ -104,7 +104,7 @@ username(_) -> undefined.
 password(type) -> binary();
 password(desc) -> ?DESC("password");
 password(required) -> false;
-password(format) -> <<"format">>;
+password(format) -> <<"password">>;
 password(_) -> undefined.
 
 auto_reconnect(type) -> boolean();
diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index bb8cb02bf..3f2cac46b 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -50,7 +50,8 @@
     auto_retry_interval => integer(),
     %%======================================= Deprecated Opts End
     worker_pool_size => pos_integer(),
-    health_check_interval => pos_integer(),
+    %% use `integer()` compatibility to release 5.0.0 bpapi
+    health_check_interval => integer(),
     %% We can choose to block the return of emqx_resource:start until
     %% the resource connected, wait max to `start_timeout` ms.
     start_timeout => pos_integer(),
diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl
index 226f9e927..2f6964380 100644
--- a/apps/emqx_resource/src/emqx_resource_manager.erl
+++ b/apps/emqx_resource/src/emqx_resource_manager.erl
@@ -385,30 +385,14 @@ handle_event(EventType, EventData, State, Data) ->
 insert_cache(ResId, Group, Data = #data{manager_id = MgrId}) ->
     case get_owner(ResId) of
         not_found ->
-            ?SLOG(
-                debug,
-                #{
-                    msg => resource_owner_not_found,
-                    resource_id => ResId,
-                    action => auto_insert_cache
-                }
-            ),
             ets:insert(?ETS_TABLE, {ResId, Group, Data});
         MgrId ->
-            ?SLOG(
-                debug,
-                #{
-                    msg => resource_owner_matched,
-                    resource_id => ResId,
-                    action => reinsert_cache
-                }
-            ),
             ets:insert(?ETS_TABLE, {ResId, Group, Data});
         _ ->
             ?SLOG(error, #{
                 msg => get_resource_owner_failed,
                 resource_id => ResId,
-                action => quit_rusource
+                action => quit_resource
             }),
             self() ! quit
     end.