IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62328)

Browse Source 
* Plugins: test ds.JsonData.MarshalJSON()

* CustomOptions: copy to avoid cyclic marshal
This commit is contained in:
Yasir Ekinci 2023-01-31 12:35:36 +01:00 committed by GitHub
parent 850d5141cf
commit c41f97029e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/datasources/service/datasource.go
View File

@ -417,7 +417,10 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou
if ds.JsonData != nil {
opts.CustomOptions = ds.JsonData.MustMap()
// allow the plugin sdk to get the json data in JSONDataFromHTTPClientOptions
opts.CustomOptions["grafanaData"] = ds.JsonData.MustMap()
opts.CustomOptions["grafanaData"] = make(map[string]interface{})
for k, v := range opts.CustomOptions {
opts.CustomOptions[k] = v
}
}
if ds.BasicAuth {
password, err := s.DecryptedBasicAuthPassword(ctx, ds)

4
pkg/services/datasources/service/datasource_test.go
View File

@ -429,6 +429,10 @@ func TestService_GetHttpTransport(t *testing.T) {
require.NotNil(t, rt)
tr := configuredTransport
// make sure we can still marshal the JsonData after httpClientOptions (avoid cycles)
_, err = ds.JsonData.MarshalJSON()
require.NoError(t, err)
require.False(t, tr.TLSClientConfig.InsecureSkipVerify)
// Ignoring deprecation, the system will not include the root CA
// used in this scenario.