From 8b4ac8eb4f0b8a30b9764ea550f7fd44406d5062 Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Tue, 7 Nov 2023 21:33:49 +0700 Subject: [PATCH] feat(oracle): accept wrapped secrets as passwords --- apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl | 4 ---- apps/emqx_oracle/src/emqx_oracle.app.src | 2 +- apps/emqx_oracle/src/emqx_oracle.erl | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl b/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl index 6b949b047..878ae2e1d 100644 --- a/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl +++ b/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl @@ -16,7 +16,6 @@ -define(APPS, [emqx_bridge, emqx_resource, emqx_rule_engine, emqx_oracle, emqx_bridge_oracle]). -define(SID, "XE"). -define(RULE_TOPIC, "mqtt/rule"). -% -define(RULE_TOPIC_BIN, <>). %%------------------------------------------------------------------------------ %% CT boilerplate @@ -33,9 +32,6 @@ groups() -> {plain, AllTCs} ]. -only_once_tests() -> - [t_create_via_http]. - init_per_suite(Config) -> Config. diff --git a/apps/emqx_oracle/src/emqx_oracle.app.src b/apps/emqx_oracle/src/emqx_oracle.app.src index 185af51e8..7740517ca 100644 --- a/apps/emqx_oracle/src/emqx_oracle.app.src +++ b/apps/emqx_oracle/src/emqx_oracle.app.src @@ -1,6 +1,6 @@ {application, emqx_oracle, [ {description, "EMQX Enterprise Oracle Database Connector"}, - {vsn, "0.1.7"}, + {vsn, "0.1.8"}, {registered, []}, {applications, [ kernel, diff --git a/apps/emqx_oracle/src/emqx_oracle.erl b/apps/emqx_oracle/src/emqx_oracle.erl index 487c1d389..c12086fce 100644 --- a/apps/emqx_oracle/src/emqx_oracle.erl +++ b/apps/emqx_oracle/src/emqx_oracle.erl @@ -95,7 +95,7 @@ on_start( {host, Host}, {port, Port}, {user, emqx_utils_conv:str(User)}, - {password, jamdb_secret:wrap(maps:get(password, Config, ""))}, + {password, maps:get(password, Config, "")}, {sid, emqx_utils_conv:str(Sid)}, {service_name, ServiceName}, {pool_size, maps:get(pool_size, Config, ?DEFAULT_POOL_SIZE)},