IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: AuthN/IdentitySynchronizer interface/impl compatibility wire fix (#74400)

Browse Source 
authn/identitysynchronizer fix
This commit is contained in:
Artur Wierzbicki 2023-09-06 15:10:07 +04:00 committed by GitHub
parent 93b9f9b537
commit d50ccd6741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/wire.go
View File

@ -42,7 +42,6 @@ import (
"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl" "github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
"github.com/grafana/grafana/pkg/services/apikey/apikeyimpl" "github.com/grafana/grafana/pkg/services/apikey/apikeyimpl"
"github.com/grafana/grafana/pkg/services/auth/jwt" "github.com/grafana/grafana/pkg/services/auth/jwt"
"github.com/grafana/grafana/pkg/services/authn"
"github.com/grafana/grafana/pkg/services/authn/authnimpl" "github.com/grafana/grafana/pkg/services/authn/authnimpl"
"github.com/grafana/grafana/pkg/services/cleanup" "github.com/grafana/grafana/pkg/services/cleanup"
"github.com/grafana/grafana/pkg/services/contexthandler" "github.com/grafana/grafana/pkg/services/contexthandler"
@ -348,8 +347,8 @@ var wireBasicSet = wire.NewSet(
tagimpl.ProvideService, tagimpl.ProvideService,
wire.Bind(new(tag.Service), new(*tagimpl.Service)), wire.Bind(new(tag.Service), new(*tagimpl.Service)),
authnimpl.ProvideService, authnimpl.ProvideService,
wire.Bind(new(authn.Service), new(*authnimpl.Service)), authnimpl.ProvideIdentitySynchronizer,
wire.Bind(new(authn.IdentitySynchronizer), new(*authnimpl.Service)), authnimpl.ProvideAuthnService,
supportbundlesimpl.ProvideService, supportbundlesimpl.ProvideService,
oasimpl.ProvideService, oasimpl.ProvideService,
wire.Bind(new(oauthserver.OAuth2Server), new(*oasimpl.OAuth2ServiceImpl)), wire.Bind(new(oauthserver.OAuth2Server), new(*oasimpl.OAuth2ServiceImpl)),

8
pkg/services/authn/authnimpl/service.go
View File

@ -48,10 +48,14 @@ var (
) )
// make sure service implements authn.Service interface // make sure service implements authn.Service interface
var _ authn.Service = new(Service) func ProvideAuthnService(s *Service) authn.Service {
return s
}
// make sure service implements authn.IdentitySynchronizer interface // make sure service implements authn.IdentitySynchronizer interface
var _ authn.IdentitySynchronizer = new(Service) func ProvideIdentitySynchronizer(s *Service) authn.IdentitySynchronizer {
return s
}
func ProvideService( func ProvideService(
cfg *setting.Cfg, tracer tracing.Tracer, cfg *setting.Cfg, tracer tracing.Tracer,