From ae5058ecc08c5ec1b90bb8ff5797e6cbd752f96d Mon Sep 17 00:00:00 2001 From: Michael Mandrus Date: Tue, 24 May 2022 16:27:07 -0400 Subject: [PATCH] refactor wire gen file --- pkg/server/wire.go | 2 -- pkg/server/wireexts_oss.go | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/server/wire.go b/pkg/server/wire.go index 419c9d241a4..548bab4ff65 100644 --- a/pkg/server/wire.go +++ b/pkg/server/wire.go @@ -246,8 +246,6 @@ var wireBasicSet = wire.NewSet( wire.Bind(new(alerting.DashAlertExtractor), new(*alerting.DashAlertExtractorService)), comments.ProvideService, guardian.ProvideService, - secretsStore.ProvideRemotePluginCheck, - wire.Bind(new(secretsStore.UseRemoteSecretsPluginCheck), new(*secretsStore.OSSRemoteSecretsPluginCheck)), secretsStore.ProvideService, avatar.ProvideAvatarCacheServer, authproxy.ProvideAuthProxy, diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go index 4f4e06b03b2..e467d3be8b5 100644 --- a/pkg/server/wireexts_oss.go +++ b/pkg/server/wireexts_oss.go @@ -31,6 +31,7 @@ import ( "github.com/grafana/grafana/pkg/services/provisioning" "github.com/grafana/grafana/pkg/services/searchusers" "github.com/grafana/grafana/pkg/services/searchusers/filters" + secretsStore "github.com/grafana/grafana/pkg/services/secrets/kvstore" "github.com/grafana/grafana/pkg/services/sqlstore/migrations" "github.com/grafana/grafana/pkg/services/thumbs" "github.com/grafana/grafana/pkg/services/validations" @@ -85,6 +86,8 @@ var wireExtsBasicSet = wire.NewSet( wire.Bind(new(registry.UsageStatsProvidersRegistry), new(*usagestatssvcs.UsageStatsProvidersRegistry)), ossaccesscontrol.ProvideDatasourcePermissionsService, wire.Bind(new(accesscontrol.DatasourcePermissionsService), new(*ossaccesscontrol.DatasourcePermissionsService)), + secretsStore.ProvideRemotePluginCheck, + wire.Bind(new(secretsStore.UseRemoteSecretsPluginCheck), new(*secretsStore.OSSRemoteSecretsPluginCheck)), ) var wireExtsSet = wire.NewSet(