add db.NeedsMigration()

Author: pashagolub

internal/cmdopts/cmdoptions.go

@@ -161,14 +161,7 @@ func (c *Options) InitConfigReaders(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	if m, ok := c.MetricsReaderWriter.(db.Migrator); ok {
-		if needsMigration, err := m.NeedsMigration(); err != nil {
-			return err
-		} else if needsMigration {
-			return metrics.ErrNeedsMigration
-		}
-	}
-	return nil
+	return db.NeedsMigration(ctx, c.MetricsReaderWriter, metrics.ErrNeedsMigration)
 }
 
 // InitSinkWriter creates a new MultiWriter instance if needed.
@@ -177,14 +170,7 @@ func (c *Options) InitSinkWriter(ctx context.Context) (err error) {
 	if err != nil {
 		return err
 	}
-	if m, ok := c.SinksWriter.(db.Migrator); ok {
-		if needsMigration, err := m.NeedsMigration(); err != nil {
-			return err
-		} else if needsMigration {
-			return sinks.ErrNeedsMigration
-		}
-	}
-	return nil
+	return db.NeedsMigration(ctx, c.SinksWriter, sinks.ErrNeedsMigration)
 }
 
 // NeedsSchemaUpgrade checks if the configuration database schema needs an upgrade.

internal/db/conn.go

@@ -52,6 +52,17 @@ type Migrator interface {
 	NeedsMigration() (bool, error)
 }
 
+func NeedsMigration(ctx context.Context, storage any, needsMigrationErr error) error {
+	if m, ok := storage.(Migrator); ok {
+		if needsMigration, err := m.NeedsMigration(); err != nil {
+			return err
+		} else if needsMigration {
+			return needsMigrationErr
+		}
+	}
+	return nil
+}
+
 func MarshallParamToJSONB(v any) any {
 	if v == nil {
 		return nil

internal/metrics/types.go

@@ -209,11 +209,6 @@ type Writer interface {
 	CreatePreset(presetName string, preset Preset) error
 }
 
-type Migrator interface {
-	Migrate() error
-	NeedsMigration() (bool, error)
-}
-
 type ReaderWriter interface {
 	Reader
 	Writer