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

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:29:23 +01:00
committed by GitHub
co-authored by Yasir Ekinci
parent cc5b3c11c4
commit 2ad87ce213
2 changed files with 8 additions and 1 deletions
@@ -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.