Slop some tests and production deploy, minor refactorings

Author: pomo-mondreganto

.github/workflows/tests.yml

@@ -24,6 +24,27 @@ jobs:
       - name: Run tests
         run: make test
 
+  e2e-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        preset: [simple, production]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+
+      - name: Create .fastad_root marker
+        run: touch .fastad_root
+
+      - name: Run E2E tests (${{ matrix.preset }} preset)
+        run: go test -tags "e2e e2e_${{ matrix.preset }}" -v ./tests/e2e/... -timeout 15m
+
   lint-go:
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -9,3 +9,5 @@ __pycache__
 .env
 /compose.yml
 /game.yml
+.sisyphus
+/fastad

cmd/allinone/main.go

@@ -13,9 +13,9 @@ import (
 	receiverImpl "github.com/c4t-but-s4d/fastad/cmd/receiver/impl"
 	schedulerImpl "github.com/c4t-but-s4d/fastad/cmd/scheduler/impl"
 	slacImpl "github.com/c4t-but-s4d/fastad/cmd/slac/impl"
-	"github.com/c4t-but-s4d/fastad/internal/api"
 	"github.com/c4t-but-s4d/fastad/internal/checkers"
 	"github.com/c4t-but-s4d/fastad/internal/dataservice"
+	"github.com/c4t-but-s4d/fastad/internal/handlers"
 	"github.com/c4t-but-s4d/fastad/internal/receiver"
 	"github.com/c4t-but-s4d/fastad/internal/scheduler"
 	"github.com/c4t-but-s4d/fastad/internal/slac"
@@ -38,7 +38,7 @@ type Config struct {
 	DataService dataservice.Config `mapstructure:"data_service"`
 	Scheduler   scheduler.Config   `mapstructure:"scheduler"`
 	Slac        slac.Config        `mapstructure:"slac"`
-	API         api.Config         `mapstructure:"api"`
+	API         handlers.Config    `mapstructure:"api"`
 	Checkers    checkers.Config    `mapstructure:"checkers"`
 	Receiver    receiver.Config    `mapstructure:"receiver"`
 }
@@ -69,7 +69,18 @@ func main() {
 		return nil
 	})
 
-	// Receiver depends on API, start it first.
+	if err := apiwait.GRPC(gctx, cfg.DataService.ListenAddress); err != nil {
+		zap.L().Error("waiting for DataService", zap.Error(err))
+		cancel()
+		return
+	}
+
+	if err := apiwait.GRPC(gctx, cfg.Slac.ListenAddress); err != nil {
+		zap.L().Error("waiting for SLAC", zap.Error(err))
+		cancel()
+		return
+	}
+
 	cfg.API.DataService.Address = cfg.DataService.ListenAddress
 	cfg.API.SlacAddress = cfg.Slac.ListenAddress
 	cfg.API.ReceiverAddress = cfg.Receiver.ListenAddress
@@ -83,6 +94,7 @@ func main() {
 	if err := apiwait.HTTP(gctx, cfg.API.ListenAddress); err != nil {
 		zap.L().Error("waiting for API", zap.Error(err))
 		cancel()
+		return
 	}
 
 	cfg.Receiver.DataService.Address = cfg.DataService.ListenAddress

cmd/api/impl/run.go

@@ -12,8 +12,8 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/c4t-but-s4d/fastad/internal/api"
 	"github.com/c4t-but-s4d/fastad/internal/centutil"
+	"github.com/c4t-but-s4d/fastad/internal/handlers"
 	"github.com/c4t-but-s4d/fastad/pkg/clients/gamestate"
 	"github.com/c4t-but-s4d/fastad/pkg/clients/services"
 	"github.com/c4t-but-s4d/fastad/pkg/clients/teams"
@@ -27,7 +27,7 @@ import (
 	slacpb "github.com/c4t-but-s4d/fastad/pkg/proto/slac"
 )
 
-func Run(runCtx, shutdownCtx context.Context, cfg *api.Config) error {
+func Run(runCtx, shutdownCtx context.Context, cfg *handlers.Config) error {
 	dataServiceConn, err := grpcext.Dial(
 		cfg.DataService.Address,
 		cfg.Installation,
@@ -79,7 +79,7 @@ func Run(runCtx, shutdownCtx context.Context, cfg *api.Config) error {
 
 	producer := centutil.NewNodeProducer(node, cfg.ScoreboardChannel)
 
-	boardBuilder := api.NewBoardBuilder(
+	boardBuilder := handlers.NewBoardBuilder(
 		teamsClient,
 		servicesClient,
 		receiverClient,
@@ -89,7 +89,7 @@ func Run(runCtx, shutdownCtx context.Context, cfg *api.Config) error {
 
 	db := cfg.Postgres.BunDB()
 
-	apiService := api.NewService(
+	apiService := handlers.NewService(
 		cfg,
 		db,
 		node,

cmd/api/main.go

@@ -4,7 +4,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/c4t-but-s4d/fastad/cmd/api/impl"
-	"github.com/c4t-but-s4d/fastad/internal/api"
+	"github.com/c4t-but-s4d/fastad/internal/handlers"
 	"github.com/c4t-but-s4d/fastad/pkg/baseconfig"
 	"github.com/c4t-but-s4d/fastad/pkg/logging"
 	"github.com/c4t-but-s4d/fastad/pkg/stop"
@@ -13,7 +13,7 @@ import (
 func main() {
 	defer logging.Init().Close()
 
-	cfg := baseconfig.MustSetupAll(&api.Config{}, baseconfig.WithEnvPrefix("FASTAD_API"))
+	cfg := baseconfig.MustSetupAll(&handlers.Config{}, baseconfig.WithEnvPrefix("FASTAD_API"))
 
 	runCtx, shutdownCtx, cancel := stop.SetupCtx()
 	defer cancel()