From 08af90daa9e27301248d860d2f05b1669ffb0020 Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Wed, 10 May 2023 10:38:40 +0200
Subject: [PATCH 1/2] fix: the iotdb password field so it has the password
 format

---
 apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl b/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
index e0312bb02..90e8d18a4 100644
--- a/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
+++ b/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
@@ -54,6 +54,7 @@ fields(auth_basic) ->
             mk(binary(), #{
                 required => true,
                 desc => ?DESC("config_auth_basic_password"),
+                format => <<"password">>,
                 sensitive => true,
                 converter => fun emqx_schema:password_converter/2
             })}

From 41f5eff014e475b32d96e0206416ce9cec41bcf3 Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Wed, 10 May 2023 10:53:40 +0200
Subject: [PATCH 2/2] fix: issues with the RabbitMQ config

---
 .../src/emqx_bridge_rabbitmq.erl                |  2 +-
 .../src/emqx_bridge_rabbitmq_connector.erl      | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq.erl b/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq.erl
index 2039fadf6..c4897fa39 100644
--- a/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq.erl
+++ b/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq.erl
@@ -95,7 +95,7 @@ fields("config") ->
 fields("creation_opts") ->
     emqx_resource_schema:fields("creation_opts");
 fields("post") ->
-    fields("post", clickhouse);
+    fields("post", rabbitmq);
 fields("put") ->
     fields("config");
 fields("get") ->
diff --git a/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq_connector.erl b/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq_connector.erl
index 6a7a68591..6f833d659 100644
--- a/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq_connector.erl
+++ b/apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq_connector.erl
@@ -72,14 +72,7 @@ fields(config) ->
                     desc => ?DESC("username")
                 }
             )},
-        {password,
-            hoconsc:mk(
-                typerefl:binary(),
-                #{
-                    required => true,
-                    desc => ?DESC("password")
-                }
-            )},
+        {password, fun emqx_connector_schema_lib:password/1},
         {pool_size,
             hoconsc:mk(
                 typerefl:pos_integer(),
@@ -129,14 +122,6 @@ fields(config) ->
                     desc => ?DESC("heartbeat")
                 }
             )},
-        {auto_reconnect,
-            hoconsc:mk(
-                emqx_schema:duration_ms(),
-                #{
-                    default => <<"2s">>,
-                    desc => ?DESC("auto_reconnect")
-                }
-            )},
         %% Things related to sending messages to RabbitMQ
         {exchange,
             hoconsc:mk(