Migrate to Wire for dependency injection (#32289)

Fixes #30144

Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
Co-authored-by: spinillos <selenepinillos@gmail.com>
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Co-authored-by: Leonard Gram <leo@xlson.com>

pkg/services/auth/auth_token.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -20,28 +19,26 @@ import (
 
 const ServiceName = "UserAuthTokenService"
 
-func init() {
-	registry.Register(&registry.Descriptor{
-		Name:         ServiceName,
-		Instance:     &UserAuthTokenService{},
-		InitPriority: registry.Medium,
-	})
-}
-
 var getTime = time.Now
 
 const urgentRotateTime = 1 * time.Minute
 
-type UserAuthTokenService struct {
-	SQLStore          *sqlstore.SQLStore            `inject:""`
-	ServerLockService *serverlock.ServerLockService `inject:""`
-	Cfg               *setting.Cfg                  `inject:""`
-	log               log.Logger
+func ProvideUserAuthTokenService(sqlStore *sqlstore.SQLStore, serverLockService *serverlock.ServerLockService,
+	cfg *setting.Cfg) *UserAuthTokenService {
+	s := &UserAuthTokenService{
+		SQLStore:          sqlStore,
+		ServerLockService: serverLockService,
+		Cfg:               cfg,
+		log:               log.New("auth"),
+	}
+	return s
 }
 
-func (s *UserAuthTokenService) Init() error {
-	s.log = log.New("auth")
-	return nil
+type UserAuthTokenService struct {
+	SQLStore          *sqlstore.SQLStore
+	ServerLockService *serverlock.ServerLockService
+	Cfg               *setting.Cfg
+	log               log.Logger
 }
 
 func (s *UserAuthTokenService) ActiveTokenCount(ctx context.Context) (int64, error) {

pkg/services/auth/jwt/auth.go

@@ -7,38 +7,34 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
 	"gopkg.in/square/go-jose.v2/jwt"
 )
 
 const ServiceName = "AuthService"
 
-func init() {
-	registry.Register(&registry.Descriptor{
-		Name:         ServiceName,
-		Instance:     &AuthService{},
-		InitPriority: registry.Medium,
-	})
+func ProvideService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache) (*AuthService, error) {
+	s := newService(cfg, remoteCache)
+	if err := s.init(); err != nil {
+		return nil, err
+	}
+
+	return s, nil
 }
 
-type AuthService struct {
-	Cfg         *setting.Cfg             `inject:""`
-	RemoteCache *remotecache.RemoteCache `inject:""`
-
-	keySet           keySet
-	log              log.Logger
-	expect           map[string]interface{}
-	expectRegistered jwt.Expected
+func newService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache) *AuthService {
+	return &AuthService{
+		Cfg:         cfg,
+		RemoteCache: remoteCache,
+		log:         log.New("auth.jwt"),
+	}
 }
 
-func (s *AuthService) Init() error {
+func (s *AuthService) init() error {
 	if !s.Cfg.JWTAuthEnabled {
 		return nil
 	}
 
-	s.log = log.New("auth.jwt")
-
 	if err := s.initClaimExpectations(); err != nil {
 		return err
 	}
@@ -49,6 +45,16 @@ func (s *AuthService) Init() error {
 	return nil
 }
 
+type AuthService struct {
+	Cfg         *setting.Cfg
+	RemoteCache *remotecache.RemoteCache
+
+	keySet           keySet
+	log              log.Logger
+	expect           map[string]interface{}
+	expectRegistered jwt.Expected
+}
+
 func (s *AuthService) Verify(ctx context.Context, strToken string) (models.JWTClaims, error) {
 	s.log.Debug("Parsing JSON Web Token")
 

pkg/services/auth/jwt/auth_test.go

@@ -13,8 +13,6 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/remotecache"
-	"github.com/grafana/grafana/pkg/registry"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -368,33 +366,18 @@ func scenario(t *testing.T, desc string, fn scenarioFunc, cbs ...configureFunc)
 }
 
 func initAuthService(t *testing.T, cbs ...configureFunc) (*AuthService, error) {
-	sqlStore := sqlstore.InitTestDB(t)
-	remoteCacheSvc := &remotecache.RemoteCache{}
+	t.Helper()
+
 	cfg := setting.NewCfg()
 	cfg.JWTAuthEnabled = true
 	cfg.JWTAuthExpectClaims = "{}"
-	cfg.RemoteCacheOptions = &setting.RemoteCacheOptions{Name: "database"}
+
 	for _, cb := range cbs {
 		cb(t, cfg)
 	}
 
-	service := &AuthService{}
-
-	err := registry.BuildServiceGraph([]interface{}{cfg}, []*registry.Descriptor{
-		{
-			Name:     sqlstore.ServiceName,
-			Instance: sqlStore,
-		},
-		{
-			Name:     remotecache.ServiceName,
-			Instance: remoteCacheSvc,
-		},
-		{
-			Name:     ServiceName,
-			Instance: service,
-		},
-	})
-
+	service := newService(cfg, remotecache.NewFakeStore(t))
+	err := service.init()
 	return service, err
 }