merge main

internal/server/api/listener_test.go

@@ -5,8 +5,6 @@ import (
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
-	"os"
-	"path"
 	"strings"
 
 	"testing"
@@ -28,7 +26,6 @@ func TestNew(t *testing.T) {
 
 	cfg := &BaseConfig{}
 	test.SetCfgProvider(t, cfg)
-	cfg.SetBasePath(path.Join(os.Getenv("PWD"), "../../.."))
 	_, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
 		Cfg: cfg,
 	})

internal/server/runner/listener_test.go

@@ -2,8 +2,6 @@ package runner
 
 import (
 	"context"
-	"os"
-	"path"
 	"testing"
 	"time"
 
@@ -24,7 +22,6 @@ func TestNew(t *testing.T) {
 	ctx := context.Background()
 	cfg := &BaseConfig{}
 	test.SetCfgProvider(t, cfg)
-	cfg.SetBasePath(path.Join(os.Getenv("PWD"), "../../.."))
 
 	_, acleanup := test.CreateAWSContainer(t, ctx, &test.CreateAWSConfig{
 		Cfg: cfg,

internal/server/server.go

@@ -3,9 +3,9 @@ package server
 import (
 	"context"
 
+	"queryorchestration/internal/database"
 	"queryorchestration/internal/serviceconfig/build"
 
-	"queryorchestration/internal/database/migrations"
 	"queryorchestration/internal/serviceconfig"
 
 	"github.com/go-playground/validator/v10"
@@ -46,7 +46,7 @@ func New(ctx context.Context, cfg Config) (func() error, error) {
 	version := build.GetVersion()
 	cfg.GetLogger().Info("Starting", "version", version)
 
-	err := migrations.Run(ctx, cfg)
+	err := database.RunMigrations(ctx, cfg)
 	if err != nil {
 		return func() error { return nil }, err
 	}

internal/server/server_test.go

@@ -3,8 +3,6 @@ package server_test
 import (
 	"context"
 	"fmt"
-	"os"
-	"path"
 	"testing"
 
 	"queryorchestration/internal/server"
@@ -23,7 +21,6 @@ func TestNew(t *testing.T) {
 
 	cfg := &server.BaseConfig{}
 	test.SetCfgProvider(t, cfg)
-	cfg.SetBasePath(path.Join(os.Getenv("PWD"), "../.."))
 
 	_, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
 		Cfg: cfg,