mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Revert "Plugins: Update PDC pattern from latest plugin SDK changes" (#76565)
Revert "Plugins: Update PDC pattern from latest plugin SDK changes (#76036)"
This reverts commit 151f6d6216.
This commit is contained in:
@@ -3,6 +3,7 @@ package setting
|
||||
import (
|
||||
"errors"
|
||||
|
||||
sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
|
||||
"gopkg.in/ini.v1"
|
||||
)
|
||||
|
||||
@@ -42,5 +43,21 @@ func readSecureSocksDSProxySettings(iniFile *ini.File) (SecureSocksDSProxySettin
|
||||
return s, errors.New("proxy address required")
|
||||
}
|
||||
|
||||
setDefaultProxyCli(s)
|
||||
|
||||
return s, nil
|
||||
}
|
||||
|
||||
// setDefaultProxyCli overrides the default proxy cli for the sdk
|
||||
//
|
||||
// Note: Not optimal changing global state, but hard to not do in this case.
|
||||
func setDefaultProxyCli(cfg SecureSocksDSProxySettings) {
|
||||
sdkproxy.Cli = sdkproxy.NewWithCfg(&sdkproxy.ClientCfg{
|
||||
Enabled: cfg.Enabled,
|
||||
ClientCert: cfg.ClientCert,
|
||||
ClientKey: cfg.ClientKey,
|
||||
ServerName: cfg.ServerName,
|
||||
RootCA: cfg.RootCA,
|
||||
ProxyAddress: cfg.ProxyAddress,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user