feat(rocketmq): accept wrapped secrets as passwords

apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src

@@ -1,6 +1,6 @@
 {application, emqx_bridge_rocketmq, [
     {description, "EMQX Enterprise RocketMQ Bridge"},
-    {vsn, "0.1.3"},
+    {vsn, "0.1.4"},
     {registered, []},
     {applications, [kernel, stdlib, emqx_resource, rocketmq]},
     {env, []},

apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl

@@ -48,13 +48,8 @@ fields(config) ->
                 binary(),
                 #{default => <<>>, desc => ?DESC("access_key")}
             )},
-        {secret_key,
+        {secret_key, emqx_schema_secret:mk(#{default => <<>>, desc => ?DESC("secret_key")})},
-            mk(
+        {security_token, emqx_schema_secret:mk(#{default => <<>>, desc => ?DESC(security_token)})},
-                binary(),
-                #{default => <<>>, desc => ?DESC("secret_key"), sensitive => true}
-            )},
-        {security_token,
-            mk(binary(), #{default => <<>>, desc => ?DESC(security_token), sensitive => true})},
         {sync_timeout,
             mk(
                 emqx_schema:timeout_duration(),
@@ -294,21 +289,19 @@ make_producer_opts(
         acl_info => emqx_secret:wrap(ACLInfo)
     }.
 
-acl_info(<<>>, <<>>, <<>>) ->
+acl_info(<<>>, _, _) ->
     #{};
-acl_info(AccessKey, SecretKey, <<>>) when is_binary(AccessKey), is_binary(SecretKey) ->
+acl_info(AccessKey, SecretKey, SecurityToken) when is_binary(AccessKey) ->
-    #{
+    Info = #{
         access_key => AccessKey,
-        secret_key => SecretKey
+        secret_key => emqx_maybe:define(emqx_secret:unwrap(SecretKey), <<>>)
-    };
+    },
-acl_info(AccessKey, SecretKey, SecurityToken) when
+    case emqx_maybe:define(emqx_secret:unwrap(SecurityToken), <<>>) of
-    is_binary(AccessKey), is_binary(SecretKey), is_binary(SecurityToken)
+        <<>> ->
-->
+            Info;
-    #{
+        Token ->
-        access_key => AccessKey,
+            Info#{security_token => Token}
-        secret_key => SecretKey,
+    end;
-        security_token => SecurityToken
-    };
 acl_info(_, _, _) ->
     #{}.