From 95489fdca8b1251993693634184d5b30e4932fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 9 Sep 2025 13:27:52 +0200
Subject: [PATCH] datasources: querier: refactor: simplify (#110516)

---
 .../apis/query/client/instance_provider.go    | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkg/registry/apis/query/client/instance_provider.go b/pkg/registry/apis/query/client/instance_provider.go
index 49f04edc77e..8b9a59e9672 100644
--- a/pkg/registry/apis/query/client/instance_provider.go
+++ b/pkg/registry/apis/query/client/instance_provider.go
@@ -14,15 +14,13 @@ import (
 )
 
 type singleTenantInstanceProvider struct {
-	client   clientapi.QueryDataClient
-	features featuremgmt.FeatureToggles
-	cfg      *setting.Cfg
+	client       clientapi.QueryDataClient
+	instanceConf clientapi.InstanceConfigurationSettings
 }
 
 type singleTenantInstance struct {
-	client   clientapi.QueryDataClient
-	features featuremgmt.FeatureToggles
-	cfg      *setting.Cfg
+	client       clientapi.QueryDataClient
+	instanceConf clientapi.InstanceConfigurationSettings
 }
 
 func (t *singleTenantInstance) GetDataSourceClient(_ context.Context, _ data.DataSourceRef) (clientapi.QueryDataClient, error) {
@@ -30,30 +28,30 @@ func (t *singleTenantInstance) GetDataSourceClient(_ context.Context, _ data.Dat
 }
 
 func NewSingleTenantInstanceProvider(cfg *setting.Cfg, features featuremgmt.FeatureToggles, p plugins.Client, ctxProv *plugincontext.Provider, accessControl accesscontrol.AccessControl) clientapi.InstanceProvider {
+	conf := clientapi.InstanceConfigurationSettings{
+		FeatureToggles:                features,
+		SQLExpressionCellLimit:        cfg.SQLExpressionCellLimit,
+		SQLExpressionOutputCellLimit:  cfg.SQLExpressionOutputCellLimit,
+		SQLExpressionQueryLengthLimit: cfg.SQLExpressionQueryLengthLimit,
+		SQLExpressionTimeout:          cfg.SQLExpressionTimeout,
+		ExpressionsEnabled:            cfg.ExpressionsEnabled,
+	}
+
 	return &singleTenantInstanceProvider{
-		cfg:      cfg,
-		features: features,
-		client:   newQueryClientForPluginClient(p, ctxProv, accessControl),
+		instanceConf: conf,
+		client:       newQueryClientForPluginClient(p, ctxProv, accessControl),
 	}
 }
 
 func (s *singleTenantInstanceProvider) GetInstance(_ context.Context, _ map[string]string) (clientapi.Instance, error) {
 	return &singleTenantInstance{
-		client:   s.client,
-		features: s.features,
-		cfg:      s.cfg,
+		client:       s.client,
+		instanceConf: s.instanceConf,
 	}, nil
 }
 
 func (s *singleTenantInstance) GetSettings() clientapi.InstanceConfigurationSettings {
-	return clientapi.InstanceConfigurationSettings{
-		FeatureToggles:                s.features,
-		SQLExpressionCellLimit:        s.cfg.SQLExpressionCellLimit,
-		SQLExpressionOutputCellLimit:  s.cfg.SQLExpressionOutputCellLimit,
-		SQLExpressionQueryLengthLimit: s.cfg.SQLExpressionQueryLengthLimit,
-		SQLExpressionTimeout:          s.cfg.SQLExpressionTimeout,
-		ExpressionsEnabled:            s.cfg.ExpressionsEnabled,
-	}
+	return s.instanceConf
 }
 
 func (s *singleTenantInstance) GetLogger(parent log.Logger) log.Logger {