From 6f19cc394ea252eafa615f4bc970e0409f6542e0 Mon Sep 17 00:00:00 2001
From: firest <enlanubo@gmail.com>
Date: Tue, 30 May 2023 18:11:48 +0800
Subject: [PATCH 1/2] fix(rocketmq): bump RocketMQ driver to enhance security
 for sensitive data

---
 apps/emqx_bridge_rocketmq/rebar.config                      | 2 +-
 .../src/emqx_bridge_rocketmq_connector.erl                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx_bridge_rocketmq/rebar.config b/apps/emqx_bridge_rocketmq/rebar.config
index 1af22f108..50dbeaa57 100644
--- a/apps/emqx_bridge_rocketmq/rebar.config
+++ b/apps/emqx_bridge_rocketmq/rebar.config
@@ -1,7 +1,7 @@
 {erl_opts, [debug_info]}.
 
 {deps, [
-    {rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.1"}}},
+    {rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.3"}}},
     {emqx_connector, {path, "../../apps/emqx_connector"}},
     {emqx_resource, {path, "../../apps/emqx_resource"}},
     {emqx_bridge, {path, "../../apps/emqx_bridge"}}
diff --git a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl
index a3da57147..dfb1f3def 100644
--- a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl
+++ b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl
@@ -115,7 +115,7 @@ on_start(
         sync_timeout => SyncTimeout,
         templates => Templates,
         producers_map_pid => ProducersMapPID,
-        producers_opts => emqx_secret:wrap(ProducerOpts)
+        producers_opts => ProducerOpts
     },
 
     case rocketmq:ensure_supervised_client(ClientId, Servers, ClientCfg) of
@@ -295,7 +295,7 @@ make_producer_opts(
     #{
         tcp_opts => [{sndbuf, SendBuff}],
         ref_topic_route_interval => RefreshInterval,
-        acl_info => ACLInfo
+        acl_info => emqx_secret:wrap(ACLInfo)
     }.
 
 acl_info(<<>>, <<>>, <<>>) ->
@@ -338,7 +338,7 @@ get_producers(ClientId, {_, Topic1} = TopicKey, ProducerOpts) ->
         _ ->
             ProducerGroup = iolist_to_binary([atom_to_list(ClientId), "_", Topic1]),
             {ok, Producers0} = rocketmq:ensure_supervised_producers(
-                ClientId, ProducerGroup, Topic1, emqx_secret:unwrap(ProducerOpts)
+                ClientId, ProducerGroup, Topic1, ProducerOpts
             ),
             ets:insert(ClientId, {TopicKey, Producers0}),
             Producers0

From a725ff0440a994367f9098fc6dc9df75208dffe3 Mon Sep 17 00:00:00 2001
From: firest <enlanubo@gmail.com>
Date: Tue, 30 May 2023 18:22:58 +0800
Subject: [PATCH 2/2] chore: bump version && update changes

---
 apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src | 2 +-
 changes/ee/feat-10877.en.md                                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changes/ee/feat-10877.en.md

diff --git a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src
index 51189d174..7da5430a9 100644
--- a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src
+++ b/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.1"},
+    {vsn, "0.1.2"},
     {registered, []},
     {applications, [kernel, stdlib, rocketmq]},
     {env, []},
diff --git a/changes/ee/feat-10877.en.md b/changes/ee/feat-10877.en.md
new file mode 100644
index 000000000..b8bd07286
--- /dev/null
+++ b/changes/ee/feat-10877.en.md
@@ -0,0 +1 @@
+Bump RocketMQ driver to enhance security for sensitive data.