From 40675843a136572ce37710a806614fdc027dd2ba Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 9 Jun 2023 09:29:48 -0300
Subject: [PATCH] fix(iotdb): remove root `request_timeout` option

Fixes https://emqx.atlassian.net/browse/EMQX-10175

Since IoTDB bridge is not used as an authn/authz source and reuses the
webhook connector, we should have only one request timeout field (the
`resource_opts.request_ttl` one) like the webhook bridge does, to
avoid confusion and potentially bad configuration combinations.
---
 apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl          | 8 --------
 .../test/emqx_bridge_iotdb_impl_SUITE.erl                 | 2 +-
 rel/i18n/emqx_bridge_iotdb.hocon                          | 6 ------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl b/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
index 9a9e95b65..724c3f43a 100644
--- a/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
+++ b/apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
@@ -141,14 +141,6 @@ request_config() ->
                     default => 2,
                     desc => ?DESC("config_max_retries")
                 }
-            )},
-        {request_timeout,
-            mk(
-                emqx_schema:timeout_duration_ms(),
-                #{
-                    default => <<"15s">>,
-                    desc => ?DESC("config_request_timeout")
-                }
             )}
     ].
 
diff --git a/apps/emqx_bridge_iotdb/test/emqx_bridge_iotdb_impl_SUITE.erl b/apps/emqx_bridge_iotdb/test/emqx_bridge_iotdb_impl_SUITE.erl
index f33795079..884f160f9 100644
--- a/apps/emqx_bridge_iotdb/test/emqx_bridge_iotdb_impl_SUITE.erl
+++ b/apps/emqx_bridge_iotdb/test/emqx_bridge_iotdb_impl_SUITE.erl
@@ -132,7 +132,7 @@ bridge_config(TestCase, _TestGroup, Config) ->
             "     username = \"root\"\n"
             "     password = \"root\"\n"
             "  }\n"
-            "iotdb_version = \"~s\"\n"
+            "  iotdb_version = \"~s\"\n"
             "  pool_size = 1\n"
             "  resource_opts = {\n"
             "     health_check_interval = 5000\n"
diff --git a/rel/i18n/emqx_bridge_iotdb.hocon b/rel/i18n/emqx_bridge_iotdb.hocon
index cb36bc5dd..e38c828f5 100644
--- a/rel/i18n/emqx_bridge_iotdb.hocon
+++ b/rel/i18n/emqx_bridge_iotdb.hocon
@@ -59,12 +59,6 @@ config_max_retries.desc:
 config_max_retries.label:
 """HTTP Request Max Retries"""
 
-config_request_timeout.desc:
-"""HTTP request timeout."""
-
-config_request_timeout.label:
-"""HTTP Request Timeout"""
-
 desc_config.desc:
 """Configuration for Apache IoTDB bridge."""