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

Revert "Plugins: Update PDC pattern from latest plugin SDK changes" (#76565)

Browse Source 
Revert "Plugins: Update PDC pattern from latest plugin SDK changes (#76036)"

This reverts commit 151f6d6216.
This commit is contained in:
Dan Cech
2023-10-13 12:35:16 -04:00
committed by GitHub
parent 5e9dac6695
commit 91cf4f0c1c
35 changed files with 81 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/prometheus/client/transport.go
+2 -3
View File
@@ -1,7 +1,6 @@
package client
import (
"context"
"fmt"
"strings"
@@ -18,8 +17,8 @@ import (
// CreateTransportOptions creates options for the http client. Probably should be shared and should not live in the
// buffered package.
func CreateTransportOptions(ctx context.Context, settings backend.DataSourceInstanceSettings, cfg *setting.Cfg, logger log.Logger) (*sdkhttpclient.Options, error) {
opts, err := settings.HTTPClientOptions(ctx)
func CreateTransportOptions(settings backend.DataSourceInstanceSettings, cfg *setting.Cfg, logger log.Logger) (*sdkhttpclient.Options, error) {
opts, err := settings.HTTPClientOptions()
if err != nil {
return nil, fmt.Errorf("error getting HTTP options: %w", err)
}
pkg/tsdb/prometheus/client/transport_test.go
+2 -3
View File
@@ -1,7 +1,6 @@
package client
import (
"context"
"testing"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
@@ -22,7 +21,7 @@ func TestCreateTransportOptions(t *testing.T) {
"httpHeaderValue1": "bar",
},
}
opts, err := CreateTransportOptions(context.Background(), settings, &setting.Cfg{}, &logtest.Fake{})
opts, err := CreateTransportOptions(settings, &setting.Cfg{}, &logtest.Fake{})
require.NoError(t, err)
require.Equal(t, map[string]string{"foo": "bar"}, opts.Headers)
require.Equal(t, 2, len(opts.Middlewares))
@@ -39,7 +38,7 @@ func TestCreateTransportOptions(t *testing.T) {
}`),
DecryptedSecureJSONData: map[string]string{},
}
opts, err := CreateTransportOptions(context.Background(), settings, &setting.Cfg{AzureAuthEnabled: true, Azure: &azsettings.AzureSettings{}}, &logtest.Fake{})
opts, err := CreateTransportOptions(settings, &setting.Cfg{AzureAuthEnabled: true, Azure: &azsettings.AzureSettings{}}, &logtest.Fake{})
require.NoError(t, err)
require.Equal(t, 3, len(opts.Middlewares))
})