IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 19:54:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

mysql: do not import httpClient from core grafana (#77628)

Browse Source 
mysql: do not use core-only exports
This commit is contained in:
Gábor Farkas 2023-11-13 10:25:19 +01:00 committed by GitHub
parent b607a4e0a2
commit fe18c63204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/tsdb/mysql/mysql.go
View File

@ -15,6 +15,7 @@ import (
"github.com/go-sql-driver/mysql"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
"github.com/grafana/grafana-plugin-sdk-go/data"
@ -46,11 +47,11 @@ func characterEscape(s string, escapeChar string) string {
func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider) *Service {
return &Service{
im: datasource.NewInstanceManager(newInstanceSettings(cfg, httpClientProvider)),
im: datasource.NewInstanceManager(newInstanceSettings(cfg)),
}
}
func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
jsonData := sqleng.JsonData{
MaxOpenConns: cfg.SqlDatasourceMaxOpenConnsDefault,
@ -114,7 +115,7 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
return nil, err
}
tlsConfig, err := httpClientProvider.GetTLSConfig(opts)
tlsConfig, err := sdkhttpclient.GetTLSConfig(opts)
if err != nil {
return nil, err
}