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

Merge remote-tracking branch 'origin/main' into ds-apiserver-with-configs

Browse Source
This commit is contained in:
Ryan McKinley
2025-07-07 13:07:20 -07:00
parent 420e070aea 1244f5c53d
commit e12d1ba6ca
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/wireset.go
-1
View File
@@ -55,7 +55,6 @@ var WireSet = wire.NewSet(
featuretoggle.RegisterAPIService, featuretoggle.RegisterAPIService,
datasource.RegisterAPIService, datasource.RegisterAPIService,
folders.RegisterAPIService, folders.RegisterAPIService,
WireSetExts, // this will be moved to wireexts_oss.go in a following PR
iam.RegisterAPIService, iam.RegisterAPIService,
ProvisioningExtras, ProvisioningExtras,
provisioning.RegisterAPIService, provisioning.RegisterAPIService,
pkg/server/wireexts_oss.go
+2
View File
@@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/manager" "github.com/grafana/grafana/pkg/plugins/manager"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
apisregistry "github.com/grafana/grafana/pkg/registry/apis"
"github.com/grafana/grafana/pkg/registry/apis/secret/contracts" "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
"github.com/grafana/grafana/pkg/registry/apis/secret/secretkeeper" "github.com/grafana/grafana/pkg/registry/apis/secret/secretkeeper"
"github.com/grafana/grafana/pkg/registry/backgroundsvcs" "github.com/grafana/grafana/pkg/registry/backgroundsvcs"
@@ -127,6 +128,7 @@ var wireExtsBasicSet = wire.NewSet(
unified.ProvideUnifiedStorageClient, unified.ProvideUnifiedStorageClient,
builder.ProvideDefaultBuildHandlerChainFuncFromBuilders, builder.ProvideDefaultBuildHandlerChainFuncFromBuilders,
aggregatorrunner.ProvideNoopAggregatorConfigurator, aggregatorrunner.ProvideNoopAggregatorConfigurator,
apisregistry.WireSetExts,
) )
var wireExtsSet = wire.NewSet( var wireExtsSet = wire.NewSet(