opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 18:42:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

ds-querier: small renames (#105701)

Browse Source
This commit is contained in:
Sarah Zinger
2025-05-22 09:04:02 -04:00
committed by GitHub
parent e05ccb822a
commit ec3f467666
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/apis/query/query.go
View File

@ -254,7 +254,7 @@ func (b *QueryAPIBuilder) handleQuerySingleDatasource(ctx context.Context, req d
return &backend.QueryDataResponse{}, nil return &backend.QueryDataResponse{}, nil
} }
client, err := b.client.GetDataSourceClient( client, err := b.clientSupplier.GetDataSourceClient(
ctx, ctx,
v0alpha1.DataSourceRef{ v0alpha1.DataSourceRef{
Type: req.PluginId, Type: req.PluginId,

4
pkg/registry/apis/query/query_test.go
View File

@ -24,7 +24,7 @@ import (
func TestQueryRestConnectHandler(t *testing.T) { func TestQueryRestConnectHandler(t *testing.T) {
b := &QueryAPIBuilder{ b := &QueryAPIBuilder{
client: mockClient{ clientSupplier: mockClient{
lastCalledWithHeaders: &map[string]string{}, lastCalledWithHeaders: &map[string]string{},
}, },
tracer: tracing.InitializeTracerForTest(), tracer: tracing.InitializeTracerForTest(),
@ -80,7 +80,7 @@ func TestQueryRestConnectHandler(t *testing.T) {
"X-Rule-Type": "type-1", "X-Rule-Type": "type-1",
"X-Rule-Version": "version-1", "X-Rule-Version": "version-1",
"X-Grafana-Org-Id": "1", "X-Grafana-Org-Id": "1",
}, *b.client.(mockClient).lastCalledWithHeaders) }, *b.clientSupplier.(mockClient).lastCalledWithHeaders)
} }
func TestInstantQueryFromAlerting(t *testing.T) { func TestInstantQueryFromAlerting(t *testing.T) {

18
pkg/registry/apis/query/register.go
View File

@ -43,17 +43,17 @@ type QueryAPIBuilder struct {
authorizer authorizer.Authorizer authorizer authorizer.Authorizer
tracer tracing.Tracer tracer tracing.Tracer
metrics *metrics.ExprMetrics metrics *metrics.ExprMetrics
parser *queryParser parser *queryParser
client clientapi.DataSourceClientSupplier clientSupplier clientapi.DataSourceClientSupplier
registry query.DataSourceApiServerRegistry registry query.DataSourceApiServerRegistry
converter *expr.ResultConverter converter *expr.ResultConverter
queryTypes *query.QueryTypeDefinitionList queryTypes *query.QueryTypeDefinitionList
} }
func NewQueryAPIBuilder(features featuremgmt.FeatureToggles, func NewQueryAPIBuilder(features featuremgmt.FeatureToggles,
client clientapi.DataSourceClientSupplier, clientSupplier clientapi.DataSourceClientSupplier,
ar authorizer.Authorizer, ar authorizer.Authorizer,
registry query.DataSourceApiServerRegistry, registry query.DataSourceApiServerRegistry,
legacy service.LegacyDataSourceLookup, legacy service.LegacyDataSourceLookup,
@ -80,7 +80,7 @@ func NewQueryAPIBuilder(features featuremgmt.FeatureToggles,
return &QueryAPIBuilder{ return &QueryAPIBuilder{
concurrentQueryLimit: 4, concurrentQueryLimit: 4,
log: log.New("query_apiserver"), log: log.New("query_apiserver"),
client: client, clientSupplier: clientSupplier,
authorizer: ar, authorizer: ar,
registry: registry, registry: registry,
parser: newQueryParser(reader, legacy, tracer, log.New("query_parser")), parser: newQueryParser(reader, legacy, tracer, log.New("query_parser")),