From d1c3b1c659a398cf7168e1d34f7a18feffd18207 Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Tue, 14 Nov 2023 16:03:48 +0700 Subject: [PATCH] fix(bridges): handle secrets more consistently Co-authored-by: Thales Macedo Garitezi --- .../emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl | 2 +- .../src/emqx_bridge_sqlserver_connector.erl | 2 +- apps/emqx_postgresql/src/emqx_postgresql.erl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl index f2af2a793..2b4fb8d74 100644 --- a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl +++ b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl @@ -379,7 +379,7 @@ username(_) -> password(#{password := Password}) -> %% TODO: teach `influxdb` to accept 0-arity closures as passwords. - [{password, emqx_secret:unwrap(Password)}]; + [{password, str(emqx_secret:unwrap(Password))}]; password(_) -> []. diff --git a/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl b/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl index 8bbb4e4b0..a87e71e31 100644 --- a/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl +++ b/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl @@ -199,7 +199,7 @@ on_start( Options = [ {server, to_bin(Server)}, {username, Username}, - {password, maps:get(password, Config, "")}, + {password, maps:get(password, Config, emqx_secret:wrap(""))}, {driver, Driver}, {database, Database}, {pool_size, PoolSize} diff --git a/apps/emqx_postgresql/src/emqx_postgresql.erl b/apps/emqx_postgresql/src/emqx_postgresql.erl index d83e3509b..ba1ad4be5 100644 --- a/apps/emqx_postgresql/src/emqx_postgresql.erl +++ b/apps/emqx_postgresql/src/emqx_postgresql.erl @@ -131,7 +131,7 @@ on_start( {host, Host}, {port, Port}, {username, User}, - {password, maps:get(password, Config, "")}, + {password, maps:get(password, Config, emqx_secret:wrap(""))}, {database, DB}, {auto_reconnect, ?AUTO_RECONNECT_INTERVAL}, {pool_size, PoolSize}