[v10.4.x] Chore: Update grafana-plugin-sdk (#85087)
* Chore: Update grafana-plugin-sdk (#84289)
(cherry picked from commit 265200799d)
* Re-generate openapi
---------
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
Co-authored-by: Giuseppe Guerra <giuseppe@guerra.in>
This commit is contained in:
co-authored by
Andres Martinez Gotor
Giuseppe Guerra
parent
6a8944a76e
commit
e1fc1e9a13
@@ -28,7 +28,7 @@ func newHTTPClient(ctx context.Context, route types.AzRoute, model types.Datasou
|
||||
}
|
||||
|
||||
for header, value := range route.Headers {
|
||||
clientOpts.Headers[header] = value
|
||||
clientOpts.Header.Add(header, value)
|
||||
}
|
||||
|
||||
// Use Azure credentials if the route has OAuth scopes configured
|
||||
|
||||
@@ -72,18 +72,18 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
res := map[string]string{
|
||||
"GrafanaHeader": "GrafanaValue",
|
||||
"AzureHeader": "AzureValue",
|
||||
res := http.Header{
|
||||
"Grafanaheader": {"GrafanaValue"},
|
||||
"Azureheader": {"AzureValue"},
|
||||
}
|
||||
_, err := newHTTPClient(context.Background(), route, model, settings, azureSettings, provider)
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.NotNil(t, provider.opts)
|
||||
|
||||
if provider.opts.Headers != nil {
|
||||
assert.Len(t, provider.opts.Headers, 2)
|
||||
assert.Equal(t, res, provider.opts.Headers)
|
||||
if provider.opts.Header != nil {
|
||||
assert.Len(t, provider.opts.Header, 2)
|
||||
assert.Equal(t, res, provider.opts.Header)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package client
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/grafana/grafana-azure-sdk-go/azsettings"
|
||||
@@ -21,7 +22,7 @@ func TestCreateTransportOptions(t *testing.T) {
|
||||
}
|
||||
opts, err := CreateTransportOptions(context.Background(), settings, backend.NewLoggerWith("logger", "test"))
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, map[string]string{"foo": "bar"}, opts.Headers)
|
||||
require.Equal(t, http.Header{"Foo": []string{"bar"}}, opts.Header)
|
||||
require.Equal(t, 2, len(opts.Middlewares))
|
||||
})
|
||||
|
||||
|
||||
@@ -81,9 +81,11 @@ func getDialOpts(settings backend.DataSourceInstanceSettings, opts httpclient.Op
|
||||
// to the CustomHeadersMiddleware in the HTTP client provider.
|
||||
func CustomHeadersStreamInterceptor(httpOpts httpclient.Options) grpc.StreamClientInterceptor {
|
||||
return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
|
||||
if len(httpOpts.Headers) != 0 {
|
||||
for key, value := range httpOpts.Headers {
|
||||
ctx = metadata.AppendToOutgoingContext(ctx, key, value)
|
||||
if len(httpOpts.Header) != 0 {
|
||||
for key, value := range httpOpts.Header {
|
||||
for _, v := range value {
|
||||
ctx = metadata.AppendToOutgoingContext(ctx, key, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user