diff --git a/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver.app.src b/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver.app.src index 1664fee59..331f9c29f 100644 --- a/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver.app.src +++ b/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver.app.src @@ -1,6 +1,6 @@ {application, emqx_bridge_sqlserver, [ {description, "EMQX Enterprise SQL Server Bridge"}, - {vsn, "0.1.4"}, + {vsn, "0.1.5"}, {registered, []}, {applications, [kernel, stdlib, emqx_resource, odbc]}, {env, []}, 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 6db8c2877..8bbb4e4b0 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, emqx_secret:wrap(maps:get(password, Config, ""))}, + {password, maps:get(password, Config, "")}, {driver, Driver}, {database, Database}, {pool_size, PoolSize} diff --git a/apps/emqx_bridge_sqlserver/test/emqx_bridge_sqlserver_SUITE.erl b/apps/emqx_bridge_sqlserver/test/emqx_bridge_sqlserver_SUITE.erl index 101ead838..62214cb5e 100644 --- a/apps/emqx_bridge_sqlserver/test/emqx_bridge_sqlserver_SUITE.erl +++ b/apps/emqx_bridge_sqlserver/test/emqx_bridge_sqlserver_SUITE.erl @@ -130,7 +130,9 @@ end_per_group(_Group, _Config) -> ok. init_per_suite(Config) -> - Config. + Passfile = filename:join(?config(priv_dir, Config), "passfile"), + ok = file:write_file(Passfile, <>), + [{sqlserver_passfile, Passfile} | Config]. end_per_suite(_Config) -> emqx_mgmt_api_test_util:end_suite(), @@ -193,7 +195,9 @@ t_setup_via_http_api_and_publish(Config) -> SQLServerConfig0 = ?config(sqlserver_config, Config), SQLServerConfig = SQLServerConfig0#{ <<"name">> => Name, - <<"type">> => BridgeType + <<"type">> => BridgeType, + %% NOTE: using literal password with HTTP API requests. + <<"password">> => <> }, ?assertMatch( {ok, _}, @@ -449,6 +453,7 @@ sqlserver_config(BridgeType, Config) -> Name = atom_to_binary(?MODULE), BatchSize = batch_size(Config), QueryMode = ?config(query_mode, Config), + Passfile = ?config(sqlserver_passfile, Config), ConfigString = io_lib:format( "bridges.~s.~s {\n" @@ -472,7 +477,7 @@ sqlserver_config(BridgeType, Config) -> Server, ?SQL_SERVER_DATABASE, ?SQL_SERVER_USERNAME, - ?SQL_SERVER_PASSWORD, + "file://" ++ Passfile, ?SQL_BRIDGE, ?SQL_SERVER_DRIVER, BatchSize,