Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: remove unused fields in backend services and runners (#18660)

Danny Xuc3e19a011ea9
diff --git a/backend/api/v1/audit_log_service.go b/backend/api/v1/audit_log_service.go
index e22f5cca36..8f754e68b6 100644
--- a/backend/api/v1/audit_log_service.go
+++ b/backend/api/v1/audit_log_service.go
@@ -12,7 +12,6 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/qb"
"github.com/bytebase/bytebase/backend/component/export"
- "github.com/bytebase/bytebase/backend/component/iam"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -23,14 +22,12 @@ import (
type AuditLogService struct {
v1connect.UnimplementedAuditLogServiceHandler
store *store.Store
- iamManager *iam.Manager
licenseService *enterprise.LicenseService
}
-func NewAuditLogService(store *store.Store, iamManager *iam.Manager, licenseService *enterprise.LicenseService) *AuditLogService {
+func NewAuditLogService(store *store.Store, licenseService *enterprise.LicenseService) *AuditLogService {
return &AuditLogService{
store: store,
- iamManager: iamManager,
licenseService: licenseService,
}
}
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.go
index e534d097c6..bc5d5500b4 100644
--- a/backend/api/v1/auth_service.go
+++ b/backend/api/v1/auth_service.go
@@ -22,7 +22,6 @@ import (
"github.com/bytebase/bytebase/backend/common/qb"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -71,18 +70,16 @@ type AuthService struct {
secret string
licenseService *enterprise.LicenseService
profile *config.Profile
- stateCfg *state.State
iamManager *iam.Manager
}
// NewAuthService creates a new AuthService.
-func NewAuthService(store *store.Store, secret string, licenseService *enterprise.LicenseService, profile *config.Profile, stateCfg *state.State, iamManager *iam.Manager) *AuthService {
+func NewAuthService(store *store.Store, secret string, licenseService *enterprise.LicenseService, profile *config.Profile, iamManager *iam.Manager) *AuthService {
return &AuthService{
store: store,
secret: secret,
licenseService: licenseService,
profile: profile,
- stateCfg: stateCfg,
iamManager: iamManager,
}
}
diff --git a/backend/api/v1/database_catalog_service.go b/backend/api/v1/database_catalog_service.go
index c40b1105f7..ac4dd17ff4 100644
--- a/backend/api/v1/database_catalog_service.go
+++ b/backend/api/v1/database_catalog_service.go
@@ -8,7 +8,6 @@ import (
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -18,15 +17,13 @@ import (
// DatabaseCatalogService implements the database catalog service.
type DatabaseCatalogService struct {
v1connect.UnimplementedDatabaseCatalogServiceHandler
- store *store.Store
- licenseService *enterprise.LicenseService
+ store *store.Store
}
// NewDatabaseCatalogService creates a new DatabaseCatalogService.
-func NewDatabaseCatalogService(store *store.Store, licenseService *enterprise.LicenseService) *DatabaseCatalogService {
+func NewDatabaseCatalogService(store *store.Store) *DatabaseCatalogService {
return &DatabaseCatalogService{
- store: store,
- licenseService: licenseService,
+ store: store,
}
}
diff --git a/backend/api/v1/database_group_service.go b/backend/api/v1/database_group_service.go
index c8cc4b7d2d..e67f3213d0 100644
--- a/backend/api/v1/database_group_service.go
+++ b/backend/api/v1/database_group_service.go
@@ -9,8 +9,6 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/component/config"
- "github.com/bytebase/bytebase/backend/component/iam"
"github.com/bytebase/bytebase/backend/enterprise"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -22,17 +20,13 @@ import (
type DatabaseGroupService struct {
v1connect.UnimplementedDatabaseGroupServiceHandler
store *store.Store
- profile *config.Profile
- iamManager *iam.Manager
licenseService *enterprise.LicenseService
}
// NewDatabaseGroupService creates a new DatabaseGroupService.
-func NewDatabaseGroupService(store *store.Store, profile *config.Profile, iamManager *iam.Manager, licenseService *enterprise.LicenseService) *DatabaseGroupService {
+func NewDatabaseGroupService(store *store.Store, licenseService *enterprise.LicenseService) *DatabaseGroupService {
return &DatabaseGroupService{
store: store,
- profile: profile,
- iamManager: iamManager,
licenseService: licenseService,
}
}
diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.go
index 17c5b0ebe6..5185811c18 100644
--- a/backend/api/v1/database_service.go
+++ b/backend/api/v1/database_service.go
@@ -17,7 +17,6 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -30,21 +29,19 @@ import (
// DatabaseService implements the database service.
type DatabaseService struct {
v1connect.UnimplementedDatabaseServiceHandler
- store *store.Store
- schemaSyncer *schemasync.Syncer
- licenseService *enterprise.LicenseService
- profile *config.Profile
- iamManager *iam.Manager
+ store *store.Store
+ schemaSyncer *schemasync.Syncer
+ profile *config.Profile
+ iamManager *iam.Manager
}
// NewDatabaseService creates a new DatabaseService.
-func NewDatabaseService(store *store.Store, schemaSyncer *schemasync.Syncer, licenseService *enterprise.LicenseService, profile *config.Profile, iamManager *iam.Manager) *DatabaseService {
+func NewDatabaseService(store *store.Store, schemaSyncer *schemasync.Syncer, profile *config.Profile, iamManager *iam.Manager) *DatabaseService {
return &DatabaseService{
- store: store,
- schemaSyncer: schemaSyncer,
- licenseService: licenseService,
- profile: profile,
- iamManager: iamManager,
+ store: store,
+ schemaSyncer: schemaSyncer,
+ profile: profile,
+ iamManager: iamManager,
}
}
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index 390b2e2c94..b7fc6ff57f 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -14,9 +14,8 @@ import (
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
- "github.com/bytebase/bytebase/backend/component/iam"
+
"github.com/bytebase/bytebase/backend/component/sampleinstance"
- "github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -32,23 +31,19 @@ type InstanceService struct {
store *store.Store
profile *config.Profile
licenseService *enterprise.LicenseService
- stateCfg *state.State
dbFactory *dbfactory.DBFactory
schemaSyncer *schemasync.Syncer
- iamManager *iam.Manager
sampleInstanceManager *sampleinstance.Manager
}
// NewInstanceService creates a new InstanceService.
-func NewInstanceService(store *store.Store, profile *config.Profile, licenseService *enterprise.LicenseService, stateCfg *state.State, dbFactory *dbfactory.DBFactory, schemaSyncer *schemasync.Syncer, iamManager *iam.Manager, sampleInstanceManager *sampleinstance.Manager) *InstanceService {
+func NewInstanceService(store *store.Store, profile *config.Profile, licenseService *enterprise.LicenseService, dbFactory *dbfactory.DBFactory, schemaSyncer *schemasync.Syncer, sampleInstanceManager *sampleinstance.Manager) *InstanceService {
return &InstanceService{
store: store,
profile: profile,
licenseService: licenseService,
- stateCfg: stateCfg,
dbFactory: dbFactory,
schemaSyncer: schemaSyncer,
- iamManager: iamManager,
sampleInstanceManager: sampleInstanceManager,
}
}
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index e361967410..2871267cdf 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -16,7 +16,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/config"
+
"github.com/bytebase/bytebase/backend/component/iam"
"github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/component/webhook"
@@ -35,7 +35,6 @@ type IssueService struct {
webhookManager *webhook.Manager
stateCfg *state.State
licenseService *enterprise.LicenseService
- profile *config.Profile
iamManager *iam.Manager
}
@@ -51,7 +50,6 @@ func NewIssueService(
webhookManager *webhook.Manager,
stateCfg *state.State,
licenseService *enterprise.LicenseService,
- profile *config.Profile,
iamManager *iam.Manager,
) *IssueService {
return &IssueService{
@@ -59,7 +57,6 @@ func NewIssueService(
webhookManager: webhookManager,
stateCfg: stateCfg,
licenseService: licenseService,
- profile: profile,
iamManager: iamManager,
}
}
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 63e1d4fbef..a261caa381 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -12,12 +12,9 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/config"
- "github.com/bytebase/bytebase/backend/component/dbfactory"
+
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/component/sheet"
"github.com/bytebase/bytebase/backend/component/state"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -27,25 +24,17 @@ import (
// PlanService represents a service for managing plan.
type PlanService struct {
v1connect.UnimplementedPlanServiceHandler
- store *store.Store
- sheetManager *sheet.Manager
- licenseService *enterprise.LicenseService
- dbFactory *dbfactory.DBFactory
- stateCfg *state.State
- profile *config.Profile
- iamManager *iam.Manager
+ store *store.Store
+ stateCfg *state.State
+ iamManager *iam.Manager
}
// NewPlanService returns a plan service instance.
-func NewPlanService(store *store.Store, sheetManager *sheet.Manager, licenseService *enterprise.LicenseService, dbFactory *dbfactory.DBFactory, stateCfg *state.State, profile *config.Profile, iamManager *iam.Manager) *PlanService {
+func NewPlanService(store *store.Store, stateCfg *state.State, iamManager *iam.Manager) *PlanService {
return &PlanService{
- store: store,
- sheetManager: sheetManager,
- licenseService: licenseService,
- dbFactory: dbFactory,
- stateCfg: stateCfg,
- profile: profile,
- iamManager: iamManager,
+ store: store,
+ stateCfg: stateCfg,
+ iamManager: iamManager,
}
}
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index bd2487f8e8..9c7747eef2 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -23,7 +23,7 @@ import (
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/enterprise"
+
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -34,10 +34,9 @@ import (
// ProjectService implements the project service.
type ProjectService struct {
v1connect.UnimplementedProjectServiceHandler
- store *store.Store
- profile *config.Profile
- iamManager *iam.Manager
- licenseService *enterprise.LicenseService
+ store *store.Store
+ profile *config.Profile
+ iamManager *iam.Manager
}
// NewProjectService creates a new ProjectService.
@@ -45,13 +44,11 @@ func NewProjectService(
store *store.Store,
profile *config.Profile,
iamManager *iam.Manager,
- licenseService *enterprise.LicenseService,
) *ProjectService {
return &ProjectService{
- store: store,
- profile: profile,
- iamManager: iamManager,
- licenseService: licenseService,
+ store: store,
+ profile: profile,
+ iamManager: iamManager,
}
}
diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.go
index 3888c745ff..88b903d664 100644
--- a/backend/api/v1/release_service.go
+++ b/backend/api/v1/release_service.go
@@ -14,8 +14,8 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/component/dbfactory"
- "github.com/bytebase/bytebase/backend/component/iam"
"github.com/bytebase/bytebase/backend/component/sheet"
+
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -28,20 +28,17 @@ type ReleaseService struct {
store *store.Store
sheetManager *sheet.Manager
dbFactory *dbfactory.DBFactory
- iamManager *iam.Manager
}
func NewReleaseService(
store *store.Store,
sheetManager *sheet.Manager,
dbFactory *dbfactory.DBFactory,
- iamManager *iam.Manager,
) *ReleaseService {
return &ReleaseService{
store: store,
sheetManager: sheetManager,
dbFactory: dbFactory,
- iamManager: iamManager,
}
}
diff --git a/backend/api/v1/review_config_service.go b/backend/api/v1/review_config_service.go
index 4b1d085d76..5ad668f74e 100644
--- a/backend/api/v1/review_config_service.go
+++ b/backend/api/v1/review_config_service.go
@@ -11,7 +11,6 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -22,15 +21,13 @@ import (
// ReviewConfigService implements the review config service.
type ReviewConfigService struct {
v1connect.UnimplementedReviewConfigServiceHandler
- store *store.Store
- licenseService *enterprise.LicenseService
+ store *store.Store
}
// NewReviewConfigService creates a new ReviewConfigService.
-func NewReviewConfigService(store *store.Store, licenseService *enterprise.LicenseService) *ReviewConfigService {
+func NewReviewConfigService(store *store.Store) *ReviewConfigService {
return &ReviewConfigService{
- store: store,
- licenseService: licenseService,
+ store: store,
}
}
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index fbb7aeb097..789dd241a6 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -14,13 +14,10 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/component/sheet"
"github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/component/webhook"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -34,25 +31,19 @@ import (
type RolloutService struct {
v1connect.UnimplementedRolloutServiceHandler
store *store.Store
- sheetManager *sheet.Manager
- licenseService *enterprise.LicenseService
dbFactory *dbfactory.DBFactory
stateCfg *state.State
webhookManager *webhook.Manager
- profile *config.Profile
iamManager *iam.Manager
}
// NewRolloutService returns a rollout service instance.
-func NewRolloutService(store *store.Store, sheetManager *sheet.Manager, licenseService *enterprise.LicenseService, dbFactory *dbfactory.DBFactory, stateCfg *state.State, webhookManager *webhook.Manager, profile *config.Profile, iamManager *iam.Manager) *RolloutService {
+func NewRolloutService(store *store.Store, dbFactory *dbfactory.DBFactory, stateCfg *state.State, webhookManager *webhook.Manager, iamManager *iam.Manager) *RolloutService {
return &RolloutService{
store: store,
- sheetManager: sheetManager,
- licenseService: licenseService,
dbFactory: dbFactory,
stateCfg: stateCfg,
webhookManager: webhookManager,
- profile: profile,
iamManager: iamManager,
}
}
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.go
index 96e920a0d7..7235b9f194 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -16,7 +16,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
- "github.com/bytebase/bytebase/backend/component/state"
+
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -36,7 +36,6 @@ type SettingService struct {
store *store.Store
profile *config.Profile
licenseService *enterprise.LicenseService
- stateCfg *state.State
}
// NewSettingService creates a new setting service.
@@ -44,13 +43,11 @@ func NewSettingService(
store *store.Store,
profile *config.Profile,
licenseService *enterprise.LicenseService,
- stateCfg *state.State,
) *SettingService {
return &SettingService{
store: store,
profile: profile,
licenseService: licenseService,
- stateCfg: stateCfg,
}
}
diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.go
index bc40cd06f7..9d40fc3878 100644
--- a/backend/api/v1/sheet_service.go
+++ b/backend/api/v1/sheet_service.go
@@ -7,10 +7,7 @@ import (
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/component/config"
- "github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/component/sheet"
- "github.com/bytebase/bytebase/backend/enterprise"
+
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
"github.com/bytebase/bytebase/backend/store"
@@ -19,21 +16,13 @@ import (
// SheetService implements the sheet service.
type SheetService struct {
v1connect.UnimplementedSheetServiceHandler
- store *store.Store
- sheetManager *sheet.Manager
- licenseService *enterprise.LicenseService
- iamManager *iam.Manager
- profile *config.Profile
+ store *store.Store
}
// NewSheetService creates a new SheetService.
-func NewSheetService(store *store.Store, sheetManager *sheet.Manager, licenseService *enterprise.LicenseService, iamManager *iam.Manager, profile *config.Profile) *SheetService {
+func NewSheetService(store *store.Store) *SheetService {
return &SheetService{
- store: store,
- sheetManager: sheetManager,
- licenseService: licenseService,
- iamManager: iamManager,
- profile: profile,
+ store: store,
}
}
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index d2cb30658d..c025b32986 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -21,11 +21,9 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/export"
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/component/sheet"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -44,31 +42,25 @@ import (
type SQLService struct {
v1connect.UnimplementedSQLServiceHandler
store *store.Store
- sheetManager *sheet.Manager
schemaSyncer *schemasync.Syncer
dbFactory *dbfactory.DBFactory
licenseService *enterprise.LicenseService
- profile *config.Profile
iamManager *iam.Manager
}
// NewSQLService creates a SQLService.
func NewSQLService(
store *store.Store,
- sheetManager *sheet.Manager,
schemaSyncer *schemasync.Syncer,
dbFactory *dbfactory.DBFactory,
licenseService *enterprise.LicenseService,
- profile *config.Profile,
iamManager *iam.Manager,
) *SQLService {
return &SQLService{
store: store,
- sheetManager: sheetManager,
schemaSyncer: schemaSyncer,
dbFactory: dbFactory,
licenseService: licenseService,
- profile: profile,
iamManager: iamManager,
}
}
diff --git a/backend/api/v1/subscription_service.go b/backend/api/v1/subscription_service.go
index a3726ff597..d3c7022725 100644
--- a/backend/api/v1/subscription_service.go
+++ b/backend/api/v1/subscription_service.go
@@ -11,24 +11,20 @@ import (
"github.com/bytebase/bytebase/backend/enterprise"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
- "github.com/bytebase/bytebase/backend/store"
)
// SubscriptionService implements the subscription service.
type SubscriptionService struct {
v1connect.UnimplementedSubscriptionServiceHandler
- store *store.Store
profile *config.Profile
licenseService *enterprise.LicenseService
}
// NewSubscriptionService creates a new SubscriptionService.
func NewSubscriptionService(
- store *store.Store,
profile *config.Profile,
licenseService *enterprise.LicenseService) *SubscriptionService {
return &SubscriptionService{
- store: store,
profile: profile,
licenseService: licenseService,
}
diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.go
index a768a0e2a3..db2a33d324 100644
--- a/backend/api/v1/user_service.go
+++ b/backend/api/v1/user_service.go
@@ -21,7 +21,7 @@ import (
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/iam"
- "github.com/bytebase/bytebase/backend/component/state"
+
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -34,21 +34,17 @@ import (
type UserService struct {
v1connect.UnimplementedUserServiceHandler
store *store.Store
- secret string
licenseService *enterprise.LicenseService
profile *config.Profile
- stateCfg *state.State
iamManager *iam.Manager
}
// NewUserService creates a new UserService.
-func NewUserService(store *store.Store, secret string, licenseService *enterprise.LicenseService, profile *config.Profile, stateCfg *state.State, iamManager *iam.Manager) *UserService {
+func NewUserService(store *store.Store, licenseService *enterprise.LicenseService, profile *config.Profile, iamManager *iam.Manager) *UserService {
return &UserService{
store: store,
- secret: secret,
licenseService: licenseService,
profile: profile,
- stateCfg: stateCfg,
iamManager: iamManager,
}
}
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index 550657b64e..b7208ce6a0 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -19,8 +19,6 @@ import (
apiv1 "github.com/bytebase/bytebase/backend/api/v1"
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/dbfactory"
- "github.com/bytebase/bytebase/backend/component/sheet"
"github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/component/webhook"
"github.com/bytebase/bytebase/backend/enterprise"
@@ -33,19 +31,15 @@ import (
// Runner is the runner for finding approval templates for issues.
type Runner struct {
store *store.Store
- sheetManager *sheet.Manager
- dbFactory *dbfactory.DBFactory
stateCfg *state.State
webhookManager *webhook.Manager
licenseService *enterprise.LicenseService
}
// NewRunner creates a new runner.
-func NewRunner(store *store.Store, sheetManager *sheet.Manager, dbFactory *dbfactory.DBFactory, stateCfg *state.State, webhookManager *webhook.Manager, licenseService *enterprise.LicenseService) *Runner {
+func NewRunner(store *store.Store, stateCfg *state.State, webhookManager *webhook.Manager, licenseService *enterprise.LicenseService) *Runner {
return &Runner{
store: store,
- sheetManager: sheetManager,
- dbFactory: dbFactory,
stateCfg: stateCfg,
webhookManager: webhookManager,
licenseService: licenseService,
diff --git a/backend/runner/plancheck/executor_combined.go b/backend/runner/plancheck/executor_combined.go
index e93655beb1..637b78481b 100644
--- a/backend/runner/plancheck/executor_combined.go
+++ b/backend/runner/plancheck/executor_combined.go
@@ -6,17 +6,15 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/sheet"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/store"
)
// CombinedExecutor processes all plan check types.
type CombinedExecutor struct {
- store *store.Store
- sheetManager *sheet.Manager
- dbFactory *dbfactory.DBFactory
- licenseService *enterprise.LicenseService
+ store *store.Store
+ sheetManager *sheet.Manager
+ dbFactory *dbfactory.DBFactory
}
// NewCombinedExecutor creates a combined executor.
@@ -24,13 +22,11 @@ func NewCombinedExecutor(
store *store.Store,
sheetManager *sheet.Manager,
dbFactory *dbfactory.DBFactory,
- licenseService *enterprise.LicenseService,
) *CombinedExecutor {
return &CombinedExecutor{
- store: store,
- sheetManager: sheetManager,
- dbFactory: dbFactory,
- licenseService: licenseService,
+ store: store,
+ sheetManager: sheetManager,
+ dbFactory: dbFactory,
}
}
@@ -80,10 +76,9 @@ func (e *CombinedExecutor) runCheck(ctx context.Context, target *storepb.PlanChe
func (e *CombinedExecutor) runStatementAdvise(ctx context.Context, target *storepb.PlanCheckRunConfig_CheckTarget) ([]*storepb.PlanCheckRunResult_Result, error) {
executor := &StatementAdviseExecutor{
- store: e.store,
- sheetManager: e.sheetManager,
- dbFactory: e.dbFactory,
- licenseService: e.licenseService,
+ store: e.store,
+ sheetManager: e.sheetManager,
+ dbFactory: e.dbFactory,
}
return executor.RunForTarget(ctx, target)
}
diff --git a/backend/runner/plancheck/scheduler.go b/backend/runner/plancheck/scheduler.go
index 78c3f486ad..f45597374d 100644
--- a/backend/runner/plancheck/scheduler.go
+++ b/backend/runner/plancheck/scheduler.go
@@ -12,7 +12,6 @@ import (
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/state"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/store"
)
@@ -22,21 +21,19 @@ const (
)
// NewScheduler creates a new plan check scheduler.
-func NewScheduler(s *store.Store, licenseService *enterprise.LicenseService, stateCfg *state.State, executor *CombinedExecutor) *Scheduler {
+func NewScheduler(s *store.Store, stateCfg *state.State, executor *CombinedExecutor) *Scheduler {
return &Scheduler{
- store: s,
- licenseService: licenseService,
- stateCfg: stateCfg,
- executor: executor,
+ store: s,
+ stateCfg: stateCfg,
+ executor: executor,
}
}
// Scheduler is the plan check run scheduler.
type Scheduler struct {
- store *store.Store
- licenseService *enterprise.LicenseService
- stateCfg *state.State
- executor *CombinedExecutor
+ store *store.Store
+ stateCfg *state.State
+ executor *CombinedExecutor
}
// Run runs the scheduler.
diff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.go
index f5b729f315..f5d625229d 100644
--- a/backend/runner/plancheck/statement_advise_executor.go
+++ b/backend/runner/plancheck/statement_advise_executor.go
@@ -11,7 +11,6 @@ import (
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/sheet"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
"github.com/bytebase/bytebase/backend/plugin/db"
@@ -25,22 +24,19 @@ func NewStatementAdviseExecutor(
store *store.Store,
sheetManager *sheet.Manager,
dbFactory *dbfactory.DBFactory,
- licenseService *enterprise.LicenseService,
) Executor {
return &StatementAdviseExecutor{
- store: store,
- sheetManager: sheetManager,
- dbFactory: dbFactory,
- licenseService: licenseService,
+ store: store,
+ sheetManager: sheetManager,
+ dbFactory: dbFactory,
}
}
// StatementAdviseExecutor is the plan check statement advise executor.
type StatementAdviseExecutor struct {
- store *store.Store
- sheetManager *sheet.Manager
- dbFactory *dbfactory.DBFactory
- licenseService *enterprise.LicenseService
+ store *store.Store
+ sheetManager *sheet.Manager
+ dbFactory *dbfactory.DBFactory
}
// RunForTarget runs the statement advise check for a single target.
diff --git a/backend/runner/schemasync/syncer.go b/backend/runner/schemasync/syncer.go
index b9b7a27621..5db89b120d 100644
--- a/backend/runner/schemasync/syncer.go
+++ b/backend/runner/schemasync/syncer.go
@@ -19,10 +19,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
- "github.com/bytebase/bytebase/backend/component/state"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/db"
"github.com/bytebase/bytebase/backend/plugin/schema"
@@ -40,13 +37,10 @@ const (
)
// NewSyncer creates a schema syncer.
-func NewSyncer(stores *store.Store, dbFactory *dbfactory.DBFactory, profile *config.Profile, stateCfg *state.State, licenseService *enterprise.LicenseService) *Syncer {
+func NewSyncer(stores *store.Store, dbFactory *dbfactory.DBFactory) *Syncer {
return &Syncer{
- store: stores,
- dbFactory: dbFactory,
- profile: profile,
- stateCfg: stateCfg,
- licenseService: licenseService,
+ store: stores,
+ dbFactory: dbFactory,
}
}
@@ -56,9 +50,6 @@ type Syncer struct {
store *store.Store
dbFactory *dbfactory.DBFactory
- profile *config.Profile
- stateCfg *state.State
- licenseService *enterprise.LicenseService
databaseSyncMap sync.Map // map[string]*store.DatabaseMessage
}
diff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.go
index cbe7b44427..a1fd7e5bd3 100644
--- a/backend/runner/taskrun/data_export_executor.go
+++ b/backend/runner/taskrun/data_export_executor.go
@@ -18,38 +18,29 @@ import (
apiv1 "github.com/bytebase/bytebase/backend/api/v1"
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/export"
- "github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/plugin/db"
- "github.com/bytebase/bytebase/backend/runner/schemasync"
"github.com/bytebase/bytebase/backend/store"
)
// NewDataExportExecutor creates a data export task executor.
-func NewDataExportExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, license *enterprise.LicenseService, stateCfg *state.State, schemaSyncer *schemasync.Syncer, profile *config.Profile) Executor {
+func NewDataExportExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, license *enterprise.LicenseService) Executor {
return &DataExportExecutor{
- store: store,
- dbFactory: dbFactory,
- license: license,
- stateCfg: stateCfg,
- schemaSyncer: schemaSyncer,
- profile: profile,
+ store: store,
+ dbFactory: dbFactory,
+ license: license,
}
}
// DataExportExecutor is the data export task executor.
type DataExportExecutor struct {
- store *store.Store
- dbFactory *dbfactory.DBFactory
- license *enterprise.LicenseService
- stateCfg *state.State
- schemaSyncer *schemasync.Syncer
- profile *config.Profile
+ store *store.Store
+ dbFactory *dbfactory.DBFactory
+ license *enterprise.LicenseService
}
// RunOnce will run the data export task executor once.
diff --git a/backend/runner/taskrun/database_create_executor.go b/backend/runner/taskrun/database_create_executor.go
index ccd13c10cf..51914eacee 100644
--- a/backend/runner/taskrun/database_create_executor.go
+++ b/backend/runner/taskrun/database_create_executor.go
@@ -10,9 +10,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
- "github.com/bytebase/bytebase/backend/component/state"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/db"
"github.com/bytebase/bytebase/backend/runner/schemasync"
@@ -20,13 +18,11 @@ import (
)
// NewDatabaseCreateExecutor creates a database create task executor.
-func NewDatabaseCreateExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, schemaSyncer *schemasync.Syncer, stateCfg *state.State, profile *config.Profile) Executor {
+func NewDatabaseCreateExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, schemaSyncer *schemasync.Syncer) Executor {
return &DatabaseCreateExecutor{
store: store,
dbFactory: dbFactory,
schemaSyncer: schemaSyncer,
- stateCfg: stateCfg,
- profile: profile,
}
}
@@ -35,8 +31,6 @@ type DatabaseCreateExecutor struct {
store *store.Store
dbFactory *dbfactory.DBFactory
schemaSyncer *schemasync.Syncer
- stateCfg *state.State
- profile *config.Profile
}
// RunOnce will run the database create task executor once.
diff --git a/backend/runner/taskrun/database_migrate_executor.go b/backend/runner/taskrun/database_migrate_executor.go
index 3851dacf88..efa25c9dde 100644
--- a/backend/runner/taskrun/database_migrate_executor.go
+++ b/backend/runner/taskrun/database_migrate_executor.go
@@ -19,7 +19,6 @@ import (
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/ghost"
"github.com/bytebase/bytebase/backend/component/state"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/db"
"github.com/bytebase/bytebase/backend/plugin/db/oracle"
@@ -32,11 +31,10 @@ import (
)
// NewDatabaseMigrateExecutor creates a database migration task executor.
-func NewDatabaseMigrateExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, license *enterprise.LicenseService, stateCfg *state.State, schemaSyncer *schemasync.Syncer, profile *config.Profile) Executor {
+func NewDatabaseMigrateExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, stateCfg *state.State, schemaSyncer *schemasync.Syncer, profile *config.Profile) Executor {
return &DatabaseMigrateExecutor{
store: store,
dbFactory: dbFactory,
- license: license,
stateCfg: stateCfg,
schemaSyncer: schemaSyncer,
profile: profile,
@@ -47,7 +45,6 @@ func NewDatabaseMigrateExecutor(store *store.Store, dbFactory *dbfactory.DBFacto
type DatabaseMigrateExecutor struct {
store *store.Store
dbFactory *dbfactory.DBFactory
- license *enterprise.LicenseService
stateCfg *state.State
schemaSyncer *schemasync.Syncer
profile *config.Profile
diff --git a/backend/runner/taskrun/scheduler.go b/backend/runner/taskrun/scheduler.go
index 4e2125c7fc..64a1a9e1df 100644
--- a/backend/runner/taskrun/scheduler.go
+++ b/backend/runner/taskrun/scheduler.go
@@ -11,10 +11,8 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
- "github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/component/webhook"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/store"
)
@@ -34,8 +32,6 @@ type Scheduler struct {
webhookManager *webhook.Manager
executorMap map[storepb.Task_Type]Executor
profile *config.Profile
- licenseService *enterprise.LicenseService
- dbFactory *dbfactory.DBFactory
}
// NewScheduler will create a new scheduler.
@@ -44,8 +40,6 @@ func NewScheduler(
stateCfg *state.State,
webhookManager *webhook.Manager,
profile *config.Profile,
- licenseService *enterprise.LicenseService,
- dbFactory *dbfactory.DBFactory,
) *Scheduler {
return &Scheduler{
store: store,
@@ -53,8 +47,6 @@ func NewScheduler(
webhookManager: webhookManager,
profile: profile,
executorMap: map[storepb.Task_Type]Executor{},
- licenseService: licenseService,
- dbFactory: dbFactory,
}
}
diff --git a/backend/runner/taskrun/schema_update_sdl_executor.go b/backend/runner/taskrun/schema_update_sdl_executor.go
index 1c55370e3c..ac5e942798 100644
--- a/backend/runner/taskrun/schema_update_sdl_executor.go
+++ b/backend/runner/taskrun/schema_update_sdl_executor.go
@@ -9,7 +9,6 @@ import (
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/state"
- "github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/db"
"github.com/bytebase/bytebase/backend/plugin/schema"
@@ -19,11 +18,10 @@ import (
)
// NewSchemaDeclareExecutor creates a schema declare (SDL) task executor.
-func NewSchemaDeclareExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, license *enterprise.LicenseService, stateCfg *state.State, schemaSyncer *schemasync.Syncer, profile *config.Profile) Executor {
+func NewSchemaDeclareExecutor(store *store.Store, dbFactory *dbfactory.DBFactory, stateCfg *state.State, schemaSyncer *schemasync.Syncer, profile *config.Profile) Executor {
return &SchemaDeclareExecutor{
store: store,
dbFactory: dbFactory,
- license: license,
stateCfg: stateCfg,
schemaSyncer: schemaSyncer,
profile: profile,
@@ -34,7 +32,6 @@ func NewSchemaDeclareExecutor(store *store.Store, dbFactory *dbfactory.DBFactory
type SchemaDeclareExecutor struct {
store *store.Store
dbFactory *dbfactory.DBFactory
- license *enterprise.LicenseService
stateCfg *state.State
schemaSyncer *schemasync.Syncer
profile *config.Profile
diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.go
index 1b0f4955ad..7e2d4ad6da 100644
--- a/backend/server/grpc_routes.go
+++ b/backend/server/grpc_routes.go
@@ -88,30 +88,30 @@ func configureGrpcRouters(
}),
)
actuatorService := apiv1.NewActuatorService(stores, profile, schemaSyncer, licenseService, sampleInstanceManager)
- auditLogService := apiv1.NewAuditLogService(stores, iamManager, licenseService)
- authService := apiv1.NewAuthService(stores, secret, licenseService, profile, stateCfg, iamManager)
+ auditLogService := apiv1.NewAuditLogService(stores, licenseService)
+ authService := apiv1.NewAuthService(stores, secret, licenseService, profile, iamManager)
celService := apiv1.NewCelService()
- databaseCatalogService := apiv1.NewDatabaseCatalogService(stores, licenseService)
- databaseGroupService := apiv1.NewDatabaseGroupService(stores, profile, iamManager, licenseService)
- databaseService := apiv1.NewDatabaseService(stores, schemaSyncer, licenseService, profile, iamManager)
+ databaseCatalogService := apiv1.NewDatabaseCatalogService(stores)
+ databaseGroupService := apiv1.NewDatabaseGroupService(stores, licenseService)
+ databaseService := apiv1.NewDatabaseService(stores, schemaSyncer, profile, iamManager)
groupService := apiv1.NewGroupService(stores, iamManager, licenseService)
identityProviderService := apiv1.NewIdentityProviderService(stores, licenseService, profile)
instanceRoleService := apiv1.NewInstanceRoleService(stores)
- instanceService := apiv1.NewInstanceService(stores, profile, licenseService, stateCfg, dbFactory, schemaSyncer, iamManager, sampleInstanceManager)
- issueService := apiv1.NewIssueService(stores, webhookManager, stateCfg, licenseService, profile, iamManager)
+ instanceService := apiv1.NewInstanceService(stores, profile, licenseService, dbFactory, schemaSyncer, sampleInstanceManager)
+ issueService := apiv1.NewIssueService(stores, webhookManager, stateCfg, licenseService, iamManager)
orgPolicyService := apiv1.NewOrgPolicyService(stores, licenseService)
- planService := apiv1.NewPlanService(stores, sheetManager, licenseService, dbFactory, stateCfg, profile, iamManager)
- projectService := apiv1.NewProjectService(stores, profile, iamManager, licenseService)
- releaseService := apiv1.NewReleaseService(stores, sheetManager, dbFactory, iamManager)
- reviewConfigService := apiv1.NewReviewConfigService(stores, licenseService)
+ planService := apiv1.NewPlanService(stores, stateCfg, iamManager)
+ projectService := apiv1.NewProjectService(stores, profile, iamManager)
+ releaseService := apiv1.NewReleaseService(stores, sheetManager, dbFactory)
+ reviewConfigService := apiv1.NewReviewConfigService(stores)
revisionService := apiv1.NewRevisionService(stores)
roleService := apiv1.NewRoleService(stores, iamManager, licenseService)
- rolloutService := apiv1.NewRolloutService(stores, sheetManager, licenseService, dbFactory, stateCfg, webhookManager, profile, iamManager)
- settingService := apiv1.NewSettingService(stores, profile, licenseService, stateCfg)
- sheetService := apiv1.NewSheetService(stores, sheetManager, licenseService, iamManager, profile)
- sqlService := apiv1.NewSQLService(stores, sheetManager, schemaSyncer, dbFactory, licenseService, profile, iamManager)
- subscriptionService := apiv1.NewSubscriptionService(stores, profile, licenseService)
- userService := apiv1.NewUserService(stores, secret, licenseService, profile, stateCfg, iamManager)
+ rolloutService := apiv1.NewRolloutService(stores, dbFactory, stateCfg, webhookManager, iamManager)
+ settingService := apiv1.NewSettingService(stores, profile, licenseService)
+ sheetService := apiv1.NewSheetService(stores)
+ sqlService := apiv1.NewSQLService(stores, schemaSyncer, dbFactory, licenseService, iamManager)
+ subscriptionService := apiv1.NewSubscriptionService(profile, licenseService)
+ userService := apiv1.NewUserService(stores, licenseService, profile, iamManager)
worksheetService := apiv1.NewWorksheetService(stores, iamManager)
workspaceService := apiv1.NewWorkspaceService(stores, iamManager)
diff --git a/backend/server/server.go b/backend/server/server.go
index 1eaba5236c..554afb1393 100644
--- a/backend/server/server.go
+++ b/backend/server/server.go
@@ -184,17 +184,17 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {
// Configure echo server.
s.echoServer = echo.New()
- s.schemaSyncer = schemasync.NewSyncer(stores, s.dbFactory, s.profile, s.stateCfg, s.licenseService)
- s.approvalRunner = approval.NewRunner(stores, sheetManager, s.dbFactory, s.stateCfg, s.webhookManager, s.licenseService)
+ s.schemaSyncer = schemasync.NewSyncer(stores, s.dbFactory)
+ s.approvalRunner = approval.NewRunner(stores, s.stateCfg, s.webhookManager, s.licenseService)
- s.taskScheduler = taskrun.NewScheduler(stores, s.stateCfg, s.webhookManager, profile, s.licenseService, s.dbFactory)
- s.taskScheduler.Register(storepb.Task_DATABASE_CREATE, taskrun.NewDatabaseCreateExecutor(stores, s.dbFactory, s.schemaSyncer, s.stateCfg, profile))
- s.taskScheduler.Register(storepb.Task_DATABASE_MIGRATE, taskrun.NewDatabaseMigrateExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))
- s.taskScheduler.Register(storepb.Task_DATABASE_EXPORT, taskrun.NewDataExportExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))
- s.taskScheduler.Register(storepb.Task_DATABASE_SDL, taskrun.NewSchemaDeclareExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))
+ s.taskScheduler = taskrun.NewScheduler(stores, s.stateCfg, s.webhookManager, profile)
+ s.taskScheduler.Register(storepb.Task_DATABASE_CREATE, taskrun.NewDatabaseCreateExecutor(stores, s.dbFactory, s.schemaSyncer))
+ s.taskScheduler.Register(storepb.Task_DATABASE_MIGRATE, taskrun.NewDatabaseMigrateExecutor(stores, s.dbFactory, s.stateCfg, s.schemaSyncer, profile))
+ s.taskScheduler.Register(storepb.Task_DATABASE_EXPORT, taskrun.NewDataExportExecutor(stores, s.dbFactory, s.licenseService))
+ s.taskScheduler.Register(storepb.Task_DATABASE_SDL, taskrun.NewSchemaDeclareExecutor(stores, s.dbFactory, s.stateCfg, s.schemaSyncer, profile))
- combinedExecutor := plancheck.NewCombinedExecutor(stores, sheetManager, s.dbFactory, s.licenseService)
- s.planCheckScheduler = plancheck.NewScheduler(stores, s.licenseService, s.stateCfg, combinedExecutor)
+ combinedExecutor := plancheck.NewCombinedExecutor(stores, sheetManager, s.dbFactory)
+ s.planCheckScheduler = plancheck.NewScheduler(stores, s.stateCfg, combinedExecutor)
// Data cleaner
s.dataCleaner = cleaner.NewDataCleaner(stores)