From 8a85d7cb5ab586c74b59a161587bbb8edc7c46b5 Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Thu, 6 Jun 2024 16:28:25 +0200 Subject: [PATCH] fix(bridge-s3): pass SSL options through `convert_certs/2` --- apps/emqx_bridge_s3/src/emqx_bridge_s3.app.src | 2 +- apps/emqx_bridge_s3/src/emqx_bridge_s3.erl | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/emqx_bridge_s3/src/emqx_bridge_s3.app.src b/apps/emqx_bridge_s3/src/emqx_bridge_s3.app.src index 01a3e6c7c..eea4ff89e 100644 --- a/apps/emqx_bridge_s3/src/emqx_bridge_s3.app.src +++ b/apps/emqx_bridge_s3/src/emqx_bridge_s3.app.src @@ -1,6 +1,6 @@ {application, emqx_bridge_s3, [ {description, "EMQX Enterprise S3 Bridge"}, - {vsn, "0.1.1"}, + {vsn, "0.1.2"}, {registered, []}, {applications, [ kernel, diff --git a/apps/emqx_bridge_s3/src/emqx_bridge_s3.erl b/apps/emqx_bridge_s3/src/emqx_bridge_s3.erl index 49f033554..e18d79786 100644 --- a/apps/emqx_bridge_s3/src/emqx_bridge_s3.erl +++ b/apps/emqx_bridge_s3/src/emqx_bridge_s3.erl @@ -22,6 +22,10 @@ connector_examples/1 ]). +-export([ + pre_config_update/4 +]). + %%------------------------------------------------------------------------------------------------- %% `hocon_schema' API %%------------------------------------------------------------------------------------------------- @@ -110,3 +114,15 @@ connector_example(put) -> enable_pipelining => 1 } }. + +%% Config update + +pre_config_update(Path, _Name, Conf = #{<<"transport_options">> := TransportOpts}, _ConfOld) -> + case emqx_connector_ssl:convert_certs(filename:join(Path), TransportOpts) of + {ok, NTransportOpts} -> + {ok, Conf#{<<"transport_options">> := NTransportOpts}}; + {error, {bad_ssl_config, Error}} -> + {error, Error#{reason => <<"bad_ssl_config">>}} + end; +pre_config_update(_Path, _Name, Conf, _ConfOld) -> + {ok, Conf}.