[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 22fe7b067c)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
pull/85422/head
grafana-delivery-bot[bot] 1 year ago committed by GitHub
parent 7bec323d23
commit 0c254bd5e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 9
      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,

Loading…
Cancel
Save