yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: make fixes due to comments from @thalesmg

This commit is contained in:
Kjell Winblad 2024-06-17 19:04:07 +02:00
parent 6d36f4a228
commit 0cbbae9655
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_bridge_rocketmq/docker-ct
View File

@ -1,3 +1,2 @@
toxiproxy toxiproxy
rocketmq rocketmq
rocketmq_ssl

15
apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector.erl
View File

@ -116,13 +116,7 @@ on_start(
Namespace = maps:get(namespace, Config, <<>>), Namespace = maps:get(namespace, Config, <<>>),
ClientCfg0 = #{acl_info => ACLInfo, namespace => Namespace}, ClientCfg0 = #{acl_info => ACLInfo, namespace => Namespace},
SSLOpts = emqx_tls_lib:to_client_opts(SSLOptsMap), SSLOpts = emqx_tls_lib:to_client_opts(SSLOptsMap),
ClientCfg = ClientCfg = emqx_utils_maps:put_if(ClientCfg0, ssl_opts, SSLOpts, SSLOpts =/= []),
case SSLOpts of
[] ->
ClientCfg0;
SSLOpts ->
ClientCfg0#{ssl_opts => SSLOpts}
end,
State = #{ State = #{
client_id => ClientId, client_id => ClientId,
acl_info => ACLInfo, acl_info => ACLInfo,
@ -432,12 +426,7 @@ make_producer_opts(
_ -> key_dispatch _ -> key_dispatch
end end
}, },
case SSLOpts of emqx_utils_maps:put_if(ProducerOpts, ssl_opts, SSLOpts, SSLOpts =/= []).
[] ->
ProducerOpts;
_ ->
ProducerOpts#{ssl_opts => SSLOpts}
end.
acl_info(<<>>, _, _) -> acl_info(<<>>, _, _) ->
#{}; #{};

2
apps/emqx_bridge_rocketmq/test/emqx_bridge_rocketmq_SUITE.erl
View File

@ -198,6 +198,8 @@ create_bridge_ssl_bad_ssl_opts(Config) ->
BridgeType = ?GET_CONFIG(rocketmq_bridge_type, Config), BridgeType = ?GET_CONFIG(rocketmq_bridge_type, Config),
Name = ?GET_CONFIG(rocketmq_name, Config), Name = ?GET_CONFIG(rocketmq_name, Config),
RocketMQConf0 = ?GET_CONFIG(rocketmq_config_ssl, 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( RocketMQConf1 = maps:put(
<<"ssl">>, <<"ssl">>,
#{ #{

6
scripts/ct/run.sh
View File

@ -200,10 +200,8 @@ for dep in ${CT_DEPS}; do
FILES+=( '.ci/docker-compose-file/docker-compose-dynamo.yaml' ) FILES+=( '.ci/docker-compose-file/docker-compose-dynamo.yaml' )
;; ;;
rocketmq) rocketmq)
FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq.yaml' ) FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq.yaml'
;; '.ci/docker-compose-file/docker-compose-rocketmq-ssl.yaml' )
rocketmq_ssl)
FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq-ssl.yaml' )
;; ;;
cassandra) cassandra)
FILES+=( '.ci/docker-compose-file/docker-compose-cassandra.yaml' ) FILES+=( '.ci/docker-compose-file/docker-compose-cassandra.yaml' )