From 2648362c6216c8e5c2408edf098822576d1cf481 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 19 Aug 2022 15:53:22 +0800 Subject: [PATCH] fix(bridge): password for bridge/db format as `password` for dashboard --- apps/emqx/src/emqx_schema.erl | 1 + apps/emqx_connector/src/emqx_connector_schema_lib.erl | 1 + apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl | 1 + lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl index 574305a4f..a76346bad 100644 --- a/apps/emqx/src/emqx_schema.erl +++ b/apps/emqx/src/emqx_schema.erl @@ -1902,6 +1902,7 @@ common_ssl_opts_schema(Defaults) -> sensitive => true, required => false, example => <<"">>, + format => <<"password">>, desc => ?DESC(common_ssl_opts_schema_password) } )}, diff --git a/apps/emqx_connector/src/emqx_connector_schema_lib.erl b/apps/emqx_connector/src/emqx_connector_schema_lib.erl index 3bd29a9c1..f37640538 100644 --- a/apps/emqx_connector/src/emqx_connector_schema_lib.erl +++ b/apps/emqx_connector/src/emqx_connector_schema_lib.erl @@ -104,6 +104,7 @@ username(_) -> undefined. password(type) -> binary(); password(desc) -> ?DESC("password"); password(required) -> false; +password(format) -> <<"format">>; password(_) -> undefined. auto_reconnect(type) -> boolean(); diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl index 8b6994dd4..4d35583a3 100644 --- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl +++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl @@ -96,6 +96,7 @@ fields("connector") -> binary(), #{ default => "emqx", + format => <<"password">>, desc => ?DESC("password") } )}, diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl index 5ec96bf2c..d2725c797 100644 --- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl +++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl @@ -142,8 +142,8 @@ fields(influxdb_udp) -> fields(influxdb_api_v1) -> [ {database, mk(binary(), #{required => true, desc => ?DESC("database")})}, - {username, mk(binary(), #{required => true, desc => ?DESC("username")})}, - {password, mk(binary(), #{required => true, desc => ?DESC("password")})} + {username, mk(binary(), #{desc => ?DESC("username")})}, + {password, mk(binary(), #{desc => ?DESC("password"), format => <<"password">>})} ] ++ emqx_connector_schema_lib:ssl_fields() ++ fields(basic); fields(influxdb_api_v2) -> [