From 40675843a136572ce37710a806614fdc027dd2ba Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 9 Jun 2023 09:29:48 -0300 Subject: [PATCH 1/3] 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.""" From 683b4d2f0f0a3e4dd01e99fe238db1473415b1e0 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 9 Jun 2023 10:26:50 -0300 Subject: [PATCH 2/3] ci: upgrade setup-beam -> v1.15.4 --- .github/workflows/build_packages.yaml | 2 +- .github/workflows/build_slim_packages.yaml | 2 +- .github/workflows/run_fvt_tests.yaml | 4 ++-- .github/workflows/run_jmeter_tests.yaml | 12 ++++++------ .github/workflows/run_relup_tests.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 7ce71b1f3..8af709552 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -88,7 +88,7 @@ jobs: fetch-depth: 0 - uses: ilammy/msvc-dev-cmd@v1.12.0 - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - name: build diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 981224d11..29e7bb13a 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -96,7 +96,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1.12.0 - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: ${{ matrix.otp }} - name: build diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index b9312d461..50d999851 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -58,7 +58,7 @@ jobs: arch: - amd64 steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/download-artifact@v3 @@ -133,7 +133,7 @@ jobs: # - emqx-enterprise # TODO test enterprise steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/run_jmeter_tests.yaml b/.github/workflows/run_jmeter_tests.yaml index 42ca9b2d3..3f45faaea 100644 --- a/.github/workflows/run_jmeter_tests.yaml +++ b/.github/workflows/run_jmeter_tests.yaml @@ -14,7 +14,7 @@ jobs: outputs: version: ${{ steps.build_docker.outputs.version}} steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - name: download jmeter @@ -57,7 +57,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/checkout@v3 @@ -153,7 +153,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/checkout@v3 @@ -259,7 +259,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/checkout@v3 @@ -361,7 +361,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/checkout@v3 @@ -460,7 +460,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/checkout@v3 diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 4974e9aa9..4b33255c6 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -71,7 +71,7 @@ jobs: shell: bash steps: # setup Erlang to run lux - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.15.4 with: otp-version: 25.3.2 - uses: actions/checkout@v3 From 4a9f2247ca51edec1beb9609955e02cccd18f316 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 9 Jun 2023 11:06:54 -0300 Subject: [PATCH 3/3] test(conf_app): fix bad merge conflict --- apps/emqx_conf/test/emqx_conf_app_SUITE.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl index f1a1383f0..2a9888451 100644 --- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl +++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl @@ -107,11 +107,13 @@ t_copy_deprecated_data_dir(Config) -> stop_cluster(Nodes) end. -t_no_copy_from_newer_version_node(_Config) -> +t_no_copy_from_newer_version_node(Config) -> net_kernel:start(['master2@127.0.0.1', longnames]), ct:timetrap({seconds, 120}), snabbkaffe:fix_ct_logging(), - Cluster = cluster([cluster_spec({core, 10}), cluster_spec({core, 11}), cluster_spec({core, 12})]), + Cluster = cluster( + [cluster_spec({core, 10}), cluster_spec({core, 11}), cluster_spec({core, 12})], Config + ), OKs = [ok, ok, ok], [First | Rest] = Nodes = start_cluster(Cluster), try