From 54c542c7954aa0c3f8a30e88d8b1593fc1a0efb6 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 27 Feb 2024 17:18:19 +0800 Subject: [PATCH] chore: rename _probe_ to t_probe_ --- apps/emqx_bridge/src/emqx_bridge.erl | 3 --- apps/emqx_bridge/src/emqx_bridge_v2.erl | 4 ++-- apps/emqx_resource/include/emqx_resource.hrl | 4 +++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl index ff86dc69a..69c913ee8 100644 --- a/apps/emqx_bridge/src/emqx_bridge.erl +++ b/apps/emqx_bridge/src/emqx_bridge.erl @@ -98,9 +98,6 @@ -define(ROOT_KEY, bridges). -%% See `hocon_tconf` --define(MAP_KEY_RE, <<"^[A-Za-z0-9]+[A-Za-z0-9-_]*$">>). - load() -> Bridges = emqx:get_config([?ROOT_KEY], #{}), emqx_utils:pforeach( diff --git a/apps/emqx_bridge/src/emqx_bridge_v2.erl b/apps/emqx_bridge/src/emqx_bridge_v2.erl index a6ddbb0b0..56fe0029a 100644 --- a/apps/emqx_bridge/src/emqx_bridge_v2.erl +++ b/apps/emqx_bridge/src/emqx_bridge_v2.erl @@ -1611,12 +1611,12 @@ split_and_validate_bridge_v1_config(BridgeV1Type, BridgeName, RawConf, PreviousR } }, try - hocon_tconf:check_plain( + _ = hocon_tconf:check_plain( emqx_connector_schema, NewFakeConnectorConfig, #{atom_key => false, required => false} ), - hocon_tconf:check_plain( + _ = hocon_tconf:check_plain( emqx_bridge_v2_schema, NewFakeBridgeV2Config, #{atom_key => false, required => false} diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl index 173ef7364..587786cb2 100644 --- a/apps/emqx_resource/include/emqx_resource.hrl +++ b/apps/emqx_resource/include/emqx_resource.hrl @@ -154,7 +154,9 @@ %% boolean -define(START_AFTER_CREATED, true). --define(TEST_ID_PREFIX, "probe__"). +%% Keep this test_id_prefix is match "^[A-Za-z0-9]+[A-Za-z0-9-_]*$". +%% See `hocon_tconf` +-define(TEST_ID_PREFIX, "t_probe_"). -define(RES_METRICS, resource_metrics). -define(RESOURCE_ALLOCATION_TAB, emqx_resource_allocations).