yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(oracle): accept wrapped secrets as passwords

This commit is contained in:
Andrew Mayorov 2023-11-07 21:33:49 +07:00
parent 34aeeab041
commit 8b4ac8eb4f
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl
View File

@ -16,7 +16,6 @@
-define(APPS, [emqx_bridge, emqx_resource, emqx_rule_engine, emqx_oracle, emqx_bridge_oracle]). -define(APPS, [emqx_bridge, emqx_resource, emqx_rule_engine, emqx_oracle, emqx_bridge_oracle]).
-define(SID, "XE"). -define(SID, "XE").
-define(RULE_TOPIC, "mqtt/rule"). -define(RULE_TOPIC, "mqtt/rule").
% -define(RULE_TOPIC_BIN, <<?RULE_TOPIC>>).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
%% CT boilerplate %% CT boilerplate
@ -33,9 +32,6 @@ groups() ->
{plain, AllTCs} {plain, AllTCs}
]. ].
only_once_tests() ->
[t_create_via_http].
init_per_suite(Config) -> init_per_suite(Config) ->
Config. Config.

2
apps/emqx_oracle/src/emqx_oracle.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_oracle, [ {application, emqx_oracle, [
{description, "EMQX Enterprise Oracle Database Connector"}, {description, "EMQX Enterprise Oracle Database Connector"},
{vsn, "0.1.7"}, {vsn, "0.1.8"},
{registered, []}, {registered, []},
{applications, [ {applications, [
kernel, kernel,

2
apps/emqx_oracle/src/emqx_oracle.erl
View File

@ -95,7 +95,7 @@ on_start(
{host, Host}, {host, Host},
{port, Port}, {port, Port},
{user, emqx_utils_conv:str(User)}, {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)}, {sid, emqx_utils_conv:str(Sid)},
{service_name, ServiceName}, {service_name, ServiceName},
{pool_size, maps:get(pool_size, Config, ?DEFAULT_POOL_SIZE)}, {pool_size, maps:get(pool_size, Config, ?DEFAULT_POOL_SIZE)},