hotfix: embed migration files

Author: sirrobot01

cmd/mcpulse/main.go

@@ -8,19 +8,20 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"syscall"
 	"time"
 
 	"github.com/golang-migrate/migrate/v4"
 	githubPgx "github.com/golang-migrate/migrate/v4/database/pgx/v5"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
+	"github.com/golang-migrate/migrate/v4/source/iofs"
 	_ "github.com/jackc/pgx/v5/stdlib"
 	"github.com/sirrobot01/mcpulse/internal/auth"
 	"github.com/sirrobot01/mcpulse/internal/config"
 	"github.com/sirrobot01/mcpulse/internal/database"
 	"github.com/sirrobot01/mcpulse/internal/ingestion"
 	"github.com/sirrobot01/mcpulse/internal/metrics"
+	"github.com/sirrobot01/mcpulse/internal/migrations"
 	"github.com/sirrobot01/mcpulse/internal/server"
 	grpcserver "github.com/sirrobot01/mcpulse/internal/server/grpc"
 	"go.uber.org/zap"
@@ -70,7 +71,7 @@ func main() {
 		MaxLifetime:        cfg.Database.MaxLifetime,
 	}
 
-	if err := runMigrations(dbConfig, cfg.Database.MigrationsPath, logger); err != nil {
+	if err := runMigrations(dbConfig, logger); err != nil {
 		logger.Fatal("failed to run database migrations", zap.Error(err))
 	}
 
@@ -141,27 +142,7 @@ func main() {
 	}
 }
 
-func runMigrations(cfg database.Config, migrationsPath string, logger *zap.Logger) error {
-	if migrationsPath == "" {
-		migrationsPath = "migrations"
-	}
-
-	absPath, err := filepath.Abs(migrationsPath)
-	if err != nil {
-		return fmt.Errorf("resolve migrations path: %w", err)
-	}
-
-	if info, statErr := os.Stat(absPath); statErr != nil {
-		if os.IsNotExist(statErr) {
-			return fmt.Errorf("migrations path does not exist: %s", absPath)
-		}
-		return fmt.Errorf("stat migrations path: %w", statErr)
-	} else if !info.IsDir() {
-		return fmt.Errorf("migrations path is not a directory: %s", absPath)
-	}
-
-	sourceURL := fmt.Sprintf("file://%s", absPath)
-
+func runMigrations(cfg database.Config, logger *zap.Logger) error {
 	db, err := sql.Open("pgx/v5", database.ConnectionString(cfg))
 	if err != nil {
 		return fmt.Errorf("open database for migrations: %w", err)
@@ -178,10 +159,18 @@ func runMigrations(cfg database.Config, migrationsPath string, logger *zap.Logge
 		return fmt.Errorf("create migration driver: %w", err)
 	}
 
-	m, err := migrate.NewWithDatabaseInstance(sourceURL, cfg.Database, driver)
-	if err != nil {
-		return fmt.Errorf("create migrator: %w", err)
+	var m *migrate.Migrate
+	var source string
+
+	// Try to use embedded migrations first
+	d, iofsErr := iofs.New(migrations.FS, ".")
+	if iofsErr == nil {
+		m, err = migrate.NewWithInstance("iofs", d, cfg.Database, driver)
+		if err == nil {
+			source = "embedded"
+		}
 	}
+
 	defer func() {
 		if sourceErr, dbErr := m.Close(); sourceErr != nil || dbErr != nil {
 			logger.Warn("migration close error", zap.Error(errors.Join(sourceErr, dbErr)))
@@ -192,7 +181,7 @@ func runMigrations(cfg database.Config, migrationsPath string, logger *zap.Logge
 		return fmt.Errorf("run migrations: %w", err)
 	}
 
-	logger.Info("database migrations applied", zap.String("path", absPath))
+	logger.Info("database migrations applied", zap.String("source", source))
 	return nil
 }
 

docker-compose.yml

@@ -38,6 +38,9 @@ services:
       - "9090:9090"  # gRPC API
     volumes:
       - ./config.yaml:/app/config.yaml:ro
+    depends_on:
+      timescale:
+        condition: service_healthy
     healthcheck:
       test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:8080/health"]
       interval: 30s

docker/Dockerfile.goreleaser

@@ -1,15 +1,15 @@
 # Final stage only - GoReleaser provides the binary
 FROM alpine:latest
 
-# Install ca-certificates for HTTPS requests
-RUN apk --no-cache add ca-certificates
+# Install ca-certificates for HTTPS requests and wget for healthcheck
+RUN apk --no-cache add ca-certificates wget
 
 # Create non-root user
 RUN addgroup -g 1000 mcpulse && \
     adduser -D -s /bin/sh -u 1000 -G mcpulse mcpulse
 
 # Set working directory
-WORKDIR /home/mcpulse
+WORKDIR /app
 
 # Copy the binary (GoReleaser puts it in build context)
 COPY mcpulse .
@@ -21,8 +21,8 @@ RUN chmod +x mcpulse && \
 # Switch to non-root user
 USER mcpulse
 
-# Expose port
-EXPOSE 8080
+# Expose ports
+EXPOSE 8080 9090
 
 # Default command
-CMD ["./mcpulse", "--config", "/home/mcpulse/config.yaml"]
+CMD ["./mcpulse", "--config", "/app/config.yaml"]

internal/config/config.go

@@ -42,7 +42,6 @@ type DatabaseConfig struct {
 	MaxConnections     int             `mapstructure:"max_connections"`
 	MaxIdleConnections int             `mapstructure:"max_idle_connections"`
 	MaxLifetime        time.Duration   `mapstructure:"connection_max_lifetime"`
-	MigrationsPath     string          `mapstructure:"migrations_path"`
 	Retention          RetentionConfig `mapstructure:"retention"`
 }
 
@@ -246,10 +245,6 @@ func (c *Config) Validate() error {
 		return fmt.Errorf("database username is required")
 	}
 
-	if strings.TrimSpace(c.Database.MigrationsPath) == "" {
-		return fmt.Errorf("database migrations path is required")
-	}
-
 	if c.Ingestion.BufferSize < 1 {
 		return fmt.Errorf("ingestion buffer size must be at least 1")
 	}