From 4711454b8198eab3e4f493b739551a74509ebff0 Mon Sep 17 00:00:00 2001
From: Emil Tullstedt <emil.tullstedt@grafana.com>
Date: Tue, 20 Sep 2022 14:28:47 +0200
Subject: [PATCH] Org: Fix service initialization (#55460)

---
 pkg/services/org/orgimpl/org.go     | 12 ++++++------
 pkg/services/thumbs/crawler_auth.go |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/services/org/orgimpl/org.go b/pkg/services/org/orgimpl/org.go
index 1d503af0adf..b27a598b700 100644
--- a/pkg/services/org/orgimpl/org.go
+++ b/pkg/services/org/orgimpl/org.go
@@ -9,7 +9,6 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/sqlstore/db"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -18,18 +17,19 @@ type Service struct {
 	store store
 	cfg   *setting.Cfg
 	log   log.Logger
-	// TODO remove sqlstore
-	sqlStore *sqlstore.SQLStore
+	// TODO remove sqlstore and use db.DB
+	sqlStore sqlstore.Store
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg) org.Service {
+func ProvideService(db sqlstore.Store, cfg *setting.Cfg) org.Service {
 	return &Service{
 		store: &sqlStore{
 			db:      db,
 			dialect: db.GetDialect(),
 		},
-		cfg: cfg,
-		log: log.New("org service"),
+		cfg:      cfg,
+		log:      log.New("org service"),
+		sqlStore: db,
 	}
 }
 
diff --git a/pkg/services/thumbs/crawler_auth.go b/pkg/services/thumbs/crawler_auth.go
index b6017a8bef4..65189d7ce0f 100644
--- a/pkg/services/thumbs/crawler_auth.go
+++ b/pkg/services/thumbs/crawler_auth.go
@@ -24,6 +24,7 @@ func ProvideCrawlerAuthSetupService(serviceAccounts serviceaccounts.Service, ser
 		log:                      log.New("oss_crawler_account_setup_service"),
 		sqlStore:                 sqlStore,
 		serviceAccountsStore:     serviceAccountsStore,
+		orgService:               orgService,
 	}
 }