From 5328955ff442cd8fa74271b6d4b0f2dfcf4961c2 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Thu, 9 Feb 2023 17:20:51 +0100
Subject: [PATCH] fix(config): add back reconnect_interval field as deprecated

---
 apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl | 2 ++
 apps/emqx_connector/src/emqx_connector.app.src                | 2 +-
 apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl   | 1 +
 changes/v5.0.17/fix-9946.en.md                                | 3 +++
 changes/v5.0.17/fix-9946.zh.md                                | 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 changes/v5.0.17/fix-9946.en.md
 create mode 100644 changes/v5.0.17/fix-9946.zh.md

diff --git a/apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl b/apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl
index 36dd6324a..5e0b4912f 100644
--- a/apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl
@@ -177,6 +177,7 @@ bridges {
         keepalive = \"60s\"
         mode = cluster_shareload
         proto_ver = \"v4\"
+        reconnect_interval = \"15s\"
         server = \"localhost:1883\"
         ssl {enable = false, verify = \"verify_peer\"}
       }
@@ -194,6 +195,7 @@ bridges {
         keepalive = \"60s\"
         mode = \"cluster_shareload\"
         proto_ver = \"v4\"
+        reconnect_interval = \"15s\"
         server = \"localhost:1883\"
         ssl {enable = false, verify = \"verify_peer\"}
       }
diff --git a/apps/emqx_connector/src/emqx_connector.app.src b/apps/emqx_connector/src/emqx_connector.app.src
index 2e955a5e9..aedc17c33 100644
--- a/apps/emqx_connector/src/emqx_connector.app.src
+++ b/apps/emqx_connector/src/emqx_connector.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_connector, [
     {description, "EMQX Data Integration Connectors"},
-    {vsn, "0.1.13"},
+    {vsn, "0.1.14"},
     {registered, []},
     {mod, {emqx_connector_app, []}},
     {applications, [
diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
index 6fabc95e8..f2163d952 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
@@ -72,6 +72,7 @@ fields("server_configs") ->
             )},
         {server, emqx_schema:servers_sc(#{desc => ?DESC("server")}, ?MQTT_HOST_OPTS)},
         {clientid_prefix, mk(binary(), #{required => false, desc => ?DESC("clientid_prefix")})},
+        {reconnect_interval, mk(string(), #{deprecated => {since, "v5.0.16"}})},
         {proto_ver,
             mk(
                 hoconsc:enum([v3, v4, v5]),
diff --git a/changes/v5.0.17/fix-9946.en.md b/changes/v5.0.17/fix-9946.en.md
new file mode 100644
index 000000000..ba6f768fa
--- /dev/null
+++ b/changes/v5.0.17/fix-9946.en.md
@@ -0,0 +1,3 @@
+Add back `reconnect_interval` as deprecated field for MQTT bridge.
+The field was removed from v5.0.16/e5.0.0 by mistake, caused new version unable to start on old config.
+Now it's added back as deprecated (config value is ignored if provided).
diff --git a/changes/v5.0.17/fix-9946.zh.md b/changes/v5.0.17/fix-9946.zh.md
new file mode 100644
index 000000000..be071e470
--- /dev/null
+++ b/changes/v5.0.17/fix-9946.zh.md
@@ -0,0 +1,2 @@
+MQTT 桥接配置参数 `reconnect_interval` 在 v5.0.16/e5.0.0 中被错误删除，
+导致旧版本配置在升级后无法使用。此修复把配置加回，但是值会忽略。