diff --git a/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.erl b/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.erl index beb8452b2..c7b378617 100644 --- a/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.erl +++ b/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.erl @@ -170,21 +170,17 @@ fields(auth_basic) -> [ {username, mk(binary(), #{required => true, desc => ?DESC("auth_basic_username")})}, {password, - mk(binary(), #{ + emqx_schema_secret:mk(#{ required => true, - desc => ?DESC("auth_basic_password"), - sensitive => true, - converter => fun emqx_schema:password_converter/2 + desc => ?DESC("auth_basic_password") })} ]; fields(auth_token) -> [ {jwt, - mk(binary(), #{ + emqx_schema_secret:mk(#{ required => true, - desc => ?DESC("auth_token_jwt"), - sensitive => true, - converter => fun emqx_schema:password_converter/2 + desc => ?DESC("auth_token_jwt") })} ]; fields("get_" ++ Type) -> diff --git a/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar_impl_producer.erl b/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar_impl_producer.erl index 33ac83ee1..fed0142c5 100644 --- a/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar_impl_producer.erl +++ b/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar_impl_producer.erl @@ -78,7 +78,6 @@ query_mode(_Config) -> -spec on_start(resource_id(), config()) -> {ok, state()}. on_start(InstanceId, Config) -> #{ - authentication := _Auth, bridge_name := BridgeName, servers := Servers0, ssl := SSL @@ -263,12 +262,14 @@ conn_opts(#{authentication := none}) -> #{}; conn_opts(#{authentication := #{username := Username, password := Password}}) -> #{ - auth_data => iolist_to_binary([Username, <<":">>, Password]), + %% TODO: teach `pulsar` to accept 0-arity closures as passwords. + auth_data => iolist_to_binary([Username, <<":">>, emqx_secret:unwrap(Password)]), auth_method_name => <<"basic">> }; conn_opts(#{authentication := #{jwt := JWT}}) -> #{ - auth_data => JWT, + %% TODO: teach `pulsar` to accept 0-arity closures as passwords. + auth_data => emqx_secret:unwrap(JWT), auth_method_name => <<"token">> }.