fix: make fixes due to comments from @thalesmg
This commit is contained in:
parent
6d36f4a228
commit
0cbbae9655
|
@ -1,3 +1,2 @@
|
|||
toxiproxy
|
||||
rocketmq
|
||||
rocketmq_ssl
|
||||
|
|
|
@ -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(<<>>, _, _) ->
|
||||
#{};
|
||||
|
|
|
@ -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">>,
|
||||
#{
|
||||
|
|
|
@ -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' )
|
||||
|
|
Loading…
Reference in New Issue