From b36844ab5cc5295d270a47e5a278f8361ffd6ecd Mon Sep 17 00:00:00 2001 From: Mistah J <26472282+mistahj67@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:39:41 -0700 Subject: [PATCH] chore: rename to preMigrationDaemons --- cmd/api/src/bootstrap/initializer.go | 10 +++++----- cmd/api/src/cmd/bhapi/main.go | 2 +- cmd/api/src/services/entrypoint.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/api/src/bootstrap/initializer.go b/cmd/api/src/bootstrap/initializer.go index 5175d3499..bc3c8e94e 100644 --- a/cmd/api/src/bootstrap/initializer.go +++ b/cmd/api/src/bootstrap/initializer.go @@ -36,9 +36,9 @@ type DatabaseConstructor[DBType database.Database, GraphType graph.Database] fun type InitializerLogic[DBType database.Database, GraphType graph.Database] func(ctx context.Context, cfg config.Configuration, databaseConnections DatabaseConnections[DBType, GraphType]) ([]daemons.Daemon, error) type Initializer[DBType database.Database, GraphType graph.Database] struct { - Configuration config.Configuration - PreEntrypoint InitializerLogic[DBType, GraphType] - Entrypoint InitializerLogic[DBType, GraphType] + Configuration config.Configuration + PreMigrationDaemons InitializerLogic[DBType, GraphType] + Entrypoint InitializerLogic[DBType, GraphType] DBConnector DatabaseConstructor[DBType, GraphType] } @@ -70,8 +70,8 @@ func (s Initializer[DBType, GraphType]) Launch(parentCtx context.Context, handle defer databaseConnections.Graph.Close(ctx) // Daemons that start prior to blocking db migration - if s.PreEntrypoint != nil { - if daemonInstances, err := s.PreEntrypoint(ctx, s.Configuration, databaseConnections); err != nil { + if s.PreMigrationDaemons != nil { + if daemonInstances, err := s.PreMigrationDaemons(ctx, s.Configuration, databaseConnections); err != nil { return fmt.Errorf("failed to start services: %w", err) } else { daemonManager.Start(ctx, daemonInstances...) diff --git a/cmd/api/src/cmd/bhapi/main.go b/cmd/api/src/cmd/bhapi/main.go index ca7b6c184..b69f7e497 100644 --- a/cmd/api/src/cmd/bhapi/main.go +++ b/cmd/api/src/cmd/bhapi/main.go @@ -66,7 +66,7 @@ func main() { initializer := bootstrap.Initializer[*database.BloodhoundDB, *graph.DatabaseSwitch]{ Configuration: cfg, DBConnector: services.ConnectDatabases, - PreEntrypoint: services.PreEntrypoint, + PreMigrationDaemons: services.PreMigrationDaemons, Entrypoint: services.Entrypoint, } diff --git a/cmd/api/src/services/entrypoint.go b/cmd/api/src/services/entrypoint.go index 76476e6c7..9f82247af 100644 --- a/cmd/api/src/services/entrypoint.go +++ b/cmd/api/src/services/entrypoint.go @@ -66,8 +66,8 @@ func ConnectDatabases(ctx context.Context, cfg config.Configuration) (bootstrap. } } -// PreEntrypoint Word of caution: These daemons will be launched prior to any migration starting -func PreEntrypoint(ctx context.Context, cfg config.Configuration, connections bootstrap.DatabaseConnections[*database.BloodhoundDB, *graph.DatabaseSwitch]) ([]daemons.Daemon, error) { +// PreMigrationDaemons Word of caution: These daemons will be launched prior to any migration starting +func PreMigrationDaemons(ctx context.Context, cfg config.Configuration, connections bootstrap.DatabaseConnections[*database.BloodhoundDB, *graph.DatabaseSwitch]) ([]daemons.Daemon, error) { return []daemons.Daemon{ toolapi.NewDaemon(ctx, connections, cfg, schema.DefaultGraphSchema()), }, nil