public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v9.3.x] Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62564)

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

* Plugins: test ds.JsonData.MarshalJSON()

* CustomOptions: copy to avoid cyclic marshal

(cherry picked from commit c41f97029e)

Co-authored-by: Yasir Ekinci <ekinci.yasir@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2023-01-31 13:28:59 +01:00
committed by GitHub
co-authored by Yasir Ekinci
parent 267d53a56a
commit aaa2a821ae
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource_test.go
+4
View File
@@ -363,6 +363,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)
require.Len(t, tr.TLSClientConfig.RootCAs.Subjects(), 1)
require.Equal(t, "server-name", tr.TLSClientConfig.ServerName)