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

Chore: Upgrade grafana-plugin-sdk-go to v0.137.0 (#50443)

Browse Source 
Co-authored-by: Todd Treece <todd.treece@grafana.com>
This commit is contained in:
Marcus Efraimsson
2022-06-09 10:10:58 +02:00
committed by GitHub
co-authored by Todd Treece
parent 0bd12ab531
commit cddab15769
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/httpclient/httpclientprovider/http_client_provider.go
+1
View File
@@ -28,6 +28,7 @@ func New(cfg *setting.Cfg, validator models.PluginRequestValidator, tracer traci
SetUserAgentMiddleware(userAgent),
sdkhttpclient.BasicAuthenticationMiddleware(),
sdkhttpclient.CustomHeadersMiddleware(),
sdkhttpclient.ContextualMiddleware(),
ResponseLimitMiddleware(cfg.ResponseLimit),
RedirectLimitMiddleware(validator),
}
pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go
+7 -5
View File
@@ -27,13 +27,14 @@ func TestHTTPClientProvider(t *testing.T) {
_ = New(&setting.Cfg{SigV4AuthEnabled: false}, &validations.OSSPluginRequestValidator{}, tracer)
require.Len(t, providerOpts, 1)
o := providerOpts[0]
require.Len(t, o.Middlewares, 7)
require.Len(t, o.Middlewares, 8)
require.Equal(t, TracingMiddlewareName, o.Middlewares[0].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, DataSourceMetricsMiddlewareName, o.Middlewares[1].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[2].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, sdkhttpclient.ContextualMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
})
t.Run("When creating new provider and SigV4 is enabled should apply expected middleware", func(t *testing.T) {
@@ -51,13 +52,14 @@ func TestHTTPClientProvider(t *testing.T) {
_ = New(&setting.Cfg{SigV4AuthEnabled: true}, &validations.OSSPluginRequestValidator{}, tracer)
require.Len(t, providerOpts, 1)
o := providerOpts[0]
require.Len(t, o.Middlewares, 8)
require.Len(t, o.Middlewares, 9)
require.Equal(t, TracingMiddlewareName, o.Middlewares[0].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, DataSourceMetricsMiddlewareName, o.Middlewares[1].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[2].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, SigV4MiddlewareName, o.Middlewares[7].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, sdkhttpclient.ContextualMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
require.Equal(t, SigV4MiddlewareName, o.Middlewares[8].(sdkhttpclient.MiddlewareName).MiddlewareName())
})
}
pkg/services/live/telemetry/telegraf/convert_test.go
+1 -1
View File
@@ -41,7 +41,7 @@ func checkTestData(t *testing.T, file string) *backend.DataResponse {
dr.Frames = append(dr.Frames, w.Frame())
}
experimental.CheckGoldenJSONResponse(t, "testdata", file, dr, true)
experimental.CheckGoldenJSONResponse(t, "testdata", file, dr, false)
return dr
}
pkg/services/live/telemetry/telegraf/testdata/changing_types_NaN.jsonc
Vendored
+4 -4
View File
@@ -8,10 +8,10 @@
// | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []string | Type: []time.Time | Type: []*float64 | Type: []*float64 | Type: []*string |
// +----------------+-------------------------------+------------------+------------------+-----------------+
// | host=A | 2021-03-22 04:51:30 -0400 EDT | 0 | null | aaa |
// | host=B | 2021-03-22 04:51:30 -0400 EDT | null | 0 | bbb |
// | host=A | 2021-03-22 04:51:31 -0400 EDT | null | 0 | ccc |
// | host=B | 2021-03-22 04:51:31 -0400 EDT | 0 | null | 1 |
// | host=A | 2021-03-22 08:51:30 +0000 UTC | 0 | null | aaa |
// | host=B | 2021-03-22 08:51:30 +0000 UTC | null | 0 | bbb |
// | host=A | 2021-03-22 08:51:31 +0000 UTC | null | 0 | ccc |
// | host=B | 2021-03-22 08:51:31 +0000 UTC | 0 | null | 1 |
// +----------------+-------------------------------+------------------+------------------+-----------------+
//
//