diff --git a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.app.src b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.app.src index 27fe1659c..c6236d97c 100644 --- a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.app.src +++ b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.app.src @@ -1,6 +1,6 @@ {application, emqx_bridge_influxdb, [ {description, "EMQX Enterprise InfluxDB Bridge"}, - {vsn, "0.1.5"}, + {vsn, "0.1.6"}, {registered, []}, {applications, [ kernel, 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 c8053a53d..f2af2a793 100644 --- a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl +++ b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl @@ -192,20 +192,14 @@ fields(influxdb_api_v1) -> [ {database, mk(binary(), #{required => true, desc => ?DESC("database")})}, {username, mk(binary(), #{desc => ?DESC("username")})}, - {password, - mk(binary(), #{ - desc => ?DESC("password"), - format => <<"password">>, - sensitive => true, - converter => fun emqx_schema:password_converter/2 - })} + {password, emqx_schema_secret:mk(#{desc => ?DESC("password")})} ] ++ emqx_connector_schema_lib:ssl_fields(); fields(influxdb_api_v2) -> fields(common) ++ [ {bucket, mk(binary(), #{required => true, desc => ?DESC("bucket")})}, {org, mk(binary(), #{required => true, desc => ?DESC("org")})}, - {token, mk(binary(), #{required => true, desc => ?DESC("token")})} + {token, emqx_schema_secret:mk(#{required => true, desc => ?DESC("token")})} ] ++ emqx_connector_schema_lib:ssl_fields(). server() -> @@ -363,7 +357,8 @@ protocol_config(#{ {version, v2}, {bucket, str(Bucket)}, {org, str(Org)}, - {token, Token} + %% TODO: teach `influxdb` to accept 0-arity closures as passwords. + {token, emqx_secret:unwrap(Token)} ] ++ ssl_config(SSL). ssl_config(#{enable := false}) -> @@ -383,7 +378,8 @@ username(_) -> []. password(#{password := Password}) -> - [{password, str(Password)}]; + %% TODO: teach `influxdb` to accept 0-arity closures as passwords. + [{password, emqx_secret:unwrap(Password)}]; password(_) -> [].