diff --git a/apps/emqx_bridge_rocketmq/docker-ct b/apps/emqx_bridge_rocketmq/docker-ct index a4cf08c48..463a9eb66 100644 --- a/apps/emqx_bridge_rocketmq/docker-ct +++ b/apps/emqx_bridge_rocketmq/docker-ct @@ -1,3 +1,2 @@ toxiproxy rocketmq -rocketmq_ssl diff --git a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl index 369307002..4fe3ea4c4 100644 --- a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl +++ b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl @@ -116,13 +116,7 @@ on_start( Namespace = maps:get(namespace, Config, <<>>), ClientCfg0 = #{acl_info => ACLInfo, namespace => Namespace}, SSLOpts = emqx_tls_lib:to_client_opts(SSLOptsMap), - ClientCfg = - case SSLOpts of - [] -> - ClientCfg0; - SSLOpts -> - ClientCfg0#{ssl_opts => SSLOpts} - end, + ClientCfg = emqx_utils_maps:put_if(ClientCfg0, ssl_opts, SSLOpts, SSLOpts =/= []), State = #{ client_id => ClientId, acl_info => ACLInfo, @@ -432,12 +426,7 @@ make_producer_opts( _ -> key_dispatch end }, - case SSLOpts of - [] -> - ProducerOpts; - _ -> - ProducerOpts#{ssl_opts => SSLOpts} - end. + emqx_utils_maps:put_if(ProducerOpts, ssl_opts, SSLOpts, SSLOpts =/= []). acl_info(<<>>, _, _) -> #{}; diff --git a/apps/emqx_bridge_rocketmq/test/emqx_bridge_rocketmq_SUITE.erl b/apps/emqx_bridge_rocketmq/test/emqx_bridge_rocketmq_SUITE.erl index 2a7f78aee..8b4ada9d7 100644 --- a/apps/emqx_bridge_rocketmq/test/emqx_bridge_rocketmq_SUITE.erl +++ b/apps/emqx_bridge_rocketmq/test/emqx_bridge_rocketmq_SUITE.erl @@ -198,6 +198,8 @@ create_bridge_ssl_bad_ssl_opts(Config) -> BridgeType = ?GET_CONFIG(rocketmq_bridge_type, Config), Name = ?GET_CONFIG(rocketmq_name, Config), RocketMQConf0 = ?GET_CONFIG(rocketmq_config_ssl, Config), + %% This config is wrong because we use verify_peer without + %% a cert that can be used in the verification. RocketMQConf1 = maps:put( <<"ssl">>, #{ diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh index 079c58035..35ab0c209 100755 --- a/scripts/ct/run.sh +++ b/scripts/ct/run.sh @@ -200,10 +200,8 @@ for dep in ${CT_DEPS}; do FILES+=( '.ci/docker-compose-file/docker-compose-dynamo.yaml' ) ;; rocketmq) - FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq.yaml' ) - ;; - rocketmq_ssl) - FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq-ssl.yaml' ) + FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq.yaml' + '.ci/docker-compose-file/docker-compose-rocketmq-ssl.yaml' ) ;; cassandra) FILES+=( '.ci/docker-compose-file/docker-compose-cassandra.yaml' )