Skip to content

Commit 8f16a4d

Browse files
authored
update migrations settings (#86)
1 parent a30fb77 commit 8f16a4d

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

gen/settings/Settings.pkl.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/settings/migrations/Config.pkl.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/migrator/migrator.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
)
1313

1414
type Migrator struct {
15-
logger *zerolog.Logger
16-
cfg migrations.Config
17-
migrations map[driver.Driver]MigrationInterface
15+
logger *zerolog.Logger
16+
mList []migrations.Migration
17+
mByDriver map[driver.Driver]MigrationInterface
1818
}
1919

2020
func NewMigrator(
@@ -26,7 +26,7 @@ func NewMigrator(
2626
}
2727
c := cfg.Settings.Migrations
2828
migrators := map[driver.Driver]MigrationInterface{}
29-
for _, m := range *c.Migrations {
29+
for _, m := range *c {
3030
switch m.GetDriver() {
3131
case driver.Clickhouse:
3232
c, ok := m.(migrations.Clickhouse)
@@ -35,20 +35,20 @@ func NewMigrator(
3535
}
3636
migrators[m.GetDriver()] = NewMigrateClick(c)
3737
case driver.Empty:
38-
return nil, fmt.Errorf("empty migrations not supported")
38+
return nil, fmt.Errorf("empty mByDriver not supported")
3939
}
4040
}
4141
return &Migrator{
42-
cfg: *c,
43-
migrations: migrators,
44-
logger: l,
42+
mList: *c,
43+
mByDriver: migrators,
44+
logger: l,
4545
}, nil
4646
}
4747
func (m *Migrator) Migrate() error {
4848
gr := errgroup.Group{}
49-
for _, mgr := range *m.cfg.Migrations {
49+
for _, mgr := range m.mList {
5050
m.logger.Info().Msgf("Starting migration: %s", mgr.GetDriver())
51-
migrator := m.migrations[mgr.GetDriver()]
51+
migrator := m.mByDriver[mgr.GetDriver()]
5252
gr.Go(func() error {
5353
err := migrator.Run(mgr.GetPath())
5454
if err != nil {

pkl/settings/Settings.pkl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ import "migrations/MigrationsConfig.pkl"
1010
logger: LoggerConfig
1111
healthCheck: HealthcheckConfig?
1212
metrics: MetricsConfig?
13-
migrations:MigrationsConfig?
13+
migrations:Listing<MigrationsConfig.Migration>?
1414
startGCAfterMessageProcess: Boolean = false
1515
gracefulShutdownDelay:Duration = 15.s

pkl/settings/migrations/MigrationsConfig.pkl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@ class Clickhouse extends Migration {
1717
credentials: Common.ChCredentials
1818
engine: String?
1919
}
20-
21-
migrations: Listing<Migration>?

0 commit comments

Comments
 (0)