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

caching middleware: handle req.PluginContext.DataSourceInstanceSettings being nil (#111258)

Browse Source 
* caching middleware: handle req.PluginContext.DataSourceInstanceSettings being nil

* add test case
This commit is contained in:
Bruno
2025-09-18 09:40:04 -03:00
committed by GitHub
parent bef45bccd8
commit acd9838701
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
+4 -4
View File
@@ -186,7 +186,7 @@ func newRequestDeduplicationMiddleware(log *log.ConcreteLogger, next backend.Han
}
func (m *requestDeduplicationMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
if req.PluginContext.DataSourceInstanceSettings.UID == "" {
if req.PluginContext.DataSourceInstanceSettings == nil || req.PluginContext.DataSourceInstanceSettings.UID == "" {
return m.BaseHandler.QueryData(ctx, req)
}
key, err := caching.GetKey(req.PluginContext.DataSourceInstanceSettings.UID, req)
@@ -198,13 +198,13 @@ func (m *requestDeduplicationMiddleware) QueryData(ctx context.Context, req *bac
return m.BaseHandler.QueryData(ctx, req)
})
if err != nil {
return nil, fmt.Errorf("singleflight: calling next.QueryData: %w", err)
return nil, fmt.Errorf("request deduplication middleware: calling BaseHandler.QueryData: %w", err)
}
return v.(*backend.QueryDataResponse), nil
}
func (m *requestDeduplicationMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
if req.PluginContext.DataSourceInstanceSettings.UID == "" {
if req.PluginContext.DataSourceInstanceSettings == nil || req.PluginContext.DataSourceInstanceSettings.UID == "" {
return m.BaseHandler.CallResource(ctx, req, sender)
}
@@ -217,7 +217,7 @@ func (m *requestDeduplicationMiddleware) CallResource(ctx context.Context, req *
return nil, m.BaseHandler.CallResource(ctx, req, sender)
})
if err != nil {
return fmt.Errorf("singleflight: calling next.CallResource: %w", err)
return fmt.Errorf("request deduplication middleware: calling BaseHandler.CallResource: %w", err)
}
return nil
}