From 0c254bd5e5e079854bfdedd1fa3cbc711c15563d Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 21:51:56 +0200 Subject: [PATCH] [v11.0.x] Plugins: Set correct PDC config values for proxy requests (#85414) Plugins: Set correct PDC config values for proxy requests (#85412) pass appropriate values (cherry picked from commit 22fe7b067cdfbc52543a536de9bf8303fdc26286) Co-authored-by: Will Browne --- pkg/services/datasources/service/datasource.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/services/datasources/service/datasource.go b/pkg/services/datasources/service/datasource.go index 25b6d60a0d1..dc4d749b560 100644 --- a/pkg/services/datasources/service/datasource.go +++ b/pkg/services/datasources/service/datasource.go @@ -532,9 +532,12 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou }, Timeouts: &sdkproxy.DefaultTimeoutOptions, ClientCfg: &sdkproxy.ClientCfg{ - ClientCert: s.cfg.SecureSocksDSProxy.ClientCert, - ClientKey: s.cfg.SecureSocksDSProxy.ClientKey, - RootCAs: s.cfg.SecureSocksDSProxy.RootCAs, + ClientCert: s.cfg.SecureSocksDSProxy.ClientCertFilePath, + ClientKey: s.cfg.SecureSocksDSProxy.ClientKeyFilePath, + RootCAs: s.cfg.SecureSocksDSProxy.RootCAFilePaths, + ClientCertVal: s.cfg.SecureSocksDSProxy.ClientCert, + ClientKeyVal: s.cfg.SecureSocksDSProxy.ClientKey, + RootCAsVals: s.cfg.SecureSocksDSProxy.RootCAs, ProxyAddress: s.cfg.SecureSocksDSProxy.ProxyAddress, ServerName: s.cfg.SecureSocksDSProxy.ServerName, AllowInsecure: s.cfg.SecureSocksDSProxy.AllowInsecure,