feat: runtime manager
This commit is contained in:
@@ -14,6 +14,7 @@ import (
|
||||
"time"
|
||||
|
||||
"galaxy/lobby/internal/domain/common"
|
||||
"galaxy/lobby/internal/domain/engineimage"
|
||||
"galaxy/lobby/internal/domain/game"
|
||||
"galaxy/lobby/internal/logging"
|
||||
"galaxy/lobby/internal/ports"
|
||||
@@ -23,11 +24,12 @@ import (
|
||||
|
||||
// Service executes the start-game use case.
|
||||
type Service struct {
|
||||
games ports.GameStore
|
||||
runtimeManager ports.RuntimeManager
|
||||
clock func() time.Time
|
||||
logger *slog.Logger
|
||||
telemetry *telemetry.Runtime
|
||||
games ports.GameStore
|
||||
runtimeManager ports.RuntimeManager
|
||||
imageResolver *engineimage.Resolver
|
||||
clock func() time.Time
|
||||
logger *slog.Logger
|
||||
telemetry *telemetry.Runtime
|
||||
}
|
||||
|
||||
// Dependencies groups the collaborators used by Service.
|
||||
@@ -38,6 +40,11 @@ type Dependencies struct {
|
||||
// RuntimeManager publishes the start job after the CAS succeeds.
|
||||
RuntimeManager ports.RuntimeManager
|
||||
|
||||
// ImageResolver substitutes a game's TargetEngineVersion into the
|
||||
// configured engine-image template to produce the `image_ref`
|
||||
// published on `runtime:start_jobs`.
|
||||
ImageResolver *engineimage.Resolver
|
||||
|
||||
// Clock supplies the wall-clock used for UpdatedAt. Defaults to
|
||||
// time.Now when nil.
|
||||
Clock func() time.Time
|
||||
@@ -58,6 +65,8 @@ func NewService(deps Dependencies) (*Service, error) {
|
||||
return nil, errors.New("new start game service: nil game store")
|
||||
case deps.RuntimeManager == nil:
|
||||
return nil, errors.New("new start game service: nil runtime manager")
|
||||
case deps.ImageResolver == nil:
|
||||
return nil, errors.New("new start game service: nil image resolver")
|
||||
}
|
||||
|
||||
clock := deps.Clock
|
||||
@@ -72,6 +81,7 @@ func NewService(deps Dependencies) (*Service, error) {
|
||||
return &Service{
|
||||
games: deps.Games,
|
||||
runtimeManager: deps.RuntimeManager,
|
||||
imageResolver: deps.ImageResolver,
|
||||
clock: clock,
|
||||
logger: logger.With("service", "lobby.startgame"),
|
||||
telemetry: deps.Telemetry,
|
||||
@@ -127,6 +137,11 @@ func (service *Service) Handle(ctx context.Context, input Input) (game.Game, err
|
||||
)
|
||||
}
|
||||
|
||||
imageRef, err := service.imageResolver.Resolve(record.TargetEngineVersion)
|
||||
if err != nil {
|
||||
return game.Game{}, fmt.Errorf("start game: resolve image ref: %w", err)
|
||||
}
|
||||
|
||||
at := service.clock().UTC()
|
||||
if err := service.games.UpdateStatus(ctx, ports.UpdateStatusInput{
|
||||
GameID: input.GameID,
|
||||
@@ -144,7 +159,7 @@ func (service *Service) Handle(ctx context.Context, input Input) (game.Game, err
|
||||
string(game.TriggerCommand),
|
||||
)
|
||||
|
||||
if err := service.runtimeManager.PublishStartJob(ctx, input.GameID.String()); err != nil {
|
||||
if err := service.runtimeManager.PublishStartJob(ctx, input.GameID.String(), imageRef); err != nil {
|
||||
// Status is already `starting` and the domain forbids a direct
|
||||
// rollback to `ready_to_start`. We surface the publish error to
|
||||
// the caller; the game stays in `starting` until either a
|
||||
|
||||
@@ -5,12 +5,14 @@ import (
|
||||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"galaxy/lobby/internal/adapters/gamestub"
|
||||
"galaxy/lobby/internal/adapters/runtimemanagerstub"
|
||||
"galaxy/lobby/internal/adapters/gameinmem"
|
||||
"galaxy/lobby/internal/adapters/mocks"
|
||||
"galaxy/lobby/internal/domain/common"
|
||||
"galaxy/lobby/internal/domain/engineimage"
|
||||
"galaxy/lobby/internal/domain/game"
|
||||
"galaxy/lobby/internal/ports"
|
||||
"galaxy/lobby/internal/service/shared"
|
||||
@@ -18,8 +20,11 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"go.uber.org/mock/gomock"
|
||||
)
|
||||
|
||||
const testImageTemplate = "registry.example.com/galaxy/game:{engine_version}"
|
||||
|
||||
func silentLogger() *slog.Logger {
|
||||
return slog.New(slog.NewTextHandler(io.Discard, nil))
|
||||
}
|
||||
@@ -50,36 +55,113 @@ func newReadyGame(t *testing.T, gameType game.GameType, ownerID string) (game.Ga
|
||||
return record, now
|
||||
}
|
||||
|
||||
// runtimeRec captures every PublishStartJob/PublishStopJob call so tests
|
||||
// can assert which jobs ran. Per-test error injection sets startErr.
|
||||
type runtimeRec struct {
|
||||
mu sync.Mutex
|
||||
startIDs []string
|
||||
startRefs []string
|
||||
stopIDs []string
|
||||
stopReas []ports.StopReason
|
||||
startErr error
|
||||
}
|
||||
|
||||
func (r *runtimeRec) recordStart(_ context.Context, gameID, imageRef string) error {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
if r.startErr != nil {
|
||||
return r.startErr
|
||||
}
|
||||
r.startIDs = append(r.startIDs, gameID)
|
||||
r.startRefs = append(r.startRefs, imageRef)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *runtimeRec) recordStop(_ context.Context, gameID string, reason ports.StopReason) error {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
r.stopIDs = append(r.stopIDs, gameID)
|
||||
r.stopReas = append(r.stopReas, reason)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *runtimeRec) startJobs() []string {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
return append([]string(nil), r.startIDs...)
|
||||
}
|
||||
|
||||
func (r *runtimeRec) startImageRefs() []string {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
return append([]string(nil), r.startRefs...)
|
||||
}
|
||||
|
||||
func (r *runtimeRec) stopJobs() []string {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
return append([]string(nil), r.stopIDs...)
|
||||
}
|
||||
|
||||
func newRuntimeMock(t *testing.T, rec *runtimeRec) *mocks.MockRuntimeManager {
|
||||
t.Helper()
|
||||
m := mocks.NewMockRuntimeManager(gomock.NewController(t))
|
||||
m.EXPECT().PublishStartJob(gomock.Any(), gomock.Any(), gomock.Any()).
|
||||
DoAndReturn(rec.recordStart).AnyTimes()
|
||||
m.EXPECT().PublishStopJob(gomock.Any(), gomock.Any(), gomock.Any()).
|
||||
DoAndReturn(rec.recordStop).AnyTimes()
|
||||
return m
|
||||
}
|
||||
|
||||
type fixture struct {
|
||||
games *gamestub.Store
|
||||
runtime *runtimemanagerstub.Publisher
|
||||
games *gameinmem.Store
|
||||
rec *runtimeRec
|
||||
runtime *mocks.MockRuntimeManager
|
||||
service *startgame.Service
|
||||
now time.Time
|
||||
}
|
||||
|
||||
func newFixture(t *testing.T, record game.Game, now time.Time) *fixture {
|
||||
t.Helper()
|
||||
games := gamestub.NewStore()
|
||||
games := gameinmem.NewStore()
|
||||
require.NoError(t, games.Save(context.Background(), record))
|
||||
runtime := runtimemanagerstub.NewPublisher()
|
||||
rec := &runtimeRec{}
|
||||
runtime := newRuntimeMock(t, rec)
|
||||
resolver, err := engineimage.NewResolver(testImageTemplate)
|
||||
require.NoError(t, err)
|
||||
service, err := startgame.NewService(startgame.Dependencies{
|
||||
Games: games,
|
||||
RuntimeManager: runtime,
|
||||
ImageResolver: resolver,
|
||||
Clock: fixedClock(now.Add(time.Hour)),
|
||||
Logger: silentLogger(),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
return &fixture{games: games, runtime: runtime, service: service, now: now}
|
||||
return &fixture{games: games, rec: rec, runtime: runtime, service: service, now: now}
|
||||
}
|
||||
|
||||
func TestNewServiceRejectsMissingDeps(t *testing.T) {
|
||||
_, err := startgame.NewService(startgame.Dependencies{
|
||||
RuntimeManager: runtimemanagerstub.NewPublisher(),
|
||||
resolver, err := engineimage.NewResolver(testImageTemplate)
|
||||
require.NoError(t, err)
|
||||
|
||||
rec := &runtimeRec{}
|
||||
runtime := newRuntimeMock(t, rec)
|
||||
|
||||
_, err = startgame.NewService(startgame.Dependencies{
|
||||
RuntimeManager: runtime,
|
||||
ImageResolver: resolver,
|
||||
})
|
||||
require.Error(t, err)
|
||||
|
||||
_, err = startgame.NewService(startgame.Dependencies{
|
||||
Games: gamestub.NewStore(),
|
||||
Games: gameinmem.NewStore(),
|
||||
ImageResolver: resolver,
|
||||
})
|
||||
require.Error(t, err)
|
||||
|
||||
_, err = startgame.NewService(startgame.Dependencies{
|
||||
Games: gameinmem.NewStore(),
|
||||
RuntimeManager: runtime,
|
||||
})
|
||||
require.Error(t, err)
|
||||
}
|
||||
@@ -94,8 +176,13 @@ func TestStartGamePublicAdminHappyPath(t *testing.T) {
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, game.StatusStarting, updated.Status)
|
||||
assert.Equal(t, []string{record.GameID.String()}, f.runtime.StartJobs())
|
||||
assert.Empty(t, f.runtime.StopJobs())
|
||||
assert.Equal(t, []string{record.GameID.String()}, f.rec.startJobs())
|
||||
assert.Equal(t,
|
||||
[]string{"registry.example.com/galaxy/game:" + record.TargetEngineVersion},
|
||||
f.rec.startImageRefs(),
|
||||
"resolved image_ref must propagate to publisher",
|
||||
)
|
||||
assert.Empty(t, f.rec.stopJobs())
|
||||
}
|
||||
|
||||
func TestStartGamePrivateOwnerHappyPath(t *testing.T) {
|
||||
@@ -108,7 +195,7 @@ func TestStartGamePrivateOwnerHappyPath(t *testing.T) {
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, game.StatusStarting, updated.Status)
|
||||
assert.Equal(t, []string{record.GameID.String()}, f.runtime.StartJobs())
|
||||
assert.Equal(t, []string{record.GameID.String()}, f.rec.startJobs())
|
||||
}
|
||||
|
||||
func TestStartGameRejectsNonOwnerUser(t *testing.T) {
|
||||
@@ -120,7 +207,7 @@ func TestStartGameRejectsNonOwnerUser(t *testing.T) {
|
||||
GameID: record.GameID,
|
||||
})
|
||||
require.ErrorIs(t, err, shared.ErrForbidden)
|
||||
assert.Empty(t, f.runtime.StartJobs(), "no start job published on forbidden")
|
||||
assert.Empty(t, f.rec.startJobs(), "no start job published on forbidden")
|
||||
|
||||
stored, err := f.games.Get(context.Background(), record.GameID)
|
||||
require.NoError(t, err)
|
||||
@@ -148,7 +235,7 @@ func TestStartGameRejectsWrongStatus(t *testing.T) {
|
||||
GameID: record.GameID,
|
||||
})
|
||||
require.ErrorIs(t, err, game.ErrConflict)
|
||||
assert.Empty(t, f.runtime.StartJobs())
|
||||
assert.Empty(t, f.rec.startJobs())
|
||||
}
|
||||
|
||||
func TestStartGameRejectsCASLossOnRecentTransition(t *testing.T) {
|
||||
@@ -169,13 +256,13 @@ func TestStartGameRejectsCASLossOnRecentTransition(t *testing.T) {
|
||||
GameID: record.GameID,
|
||||
})
|
||||
require.ErrorIs(t, err, game.ErrConflict)
|
||||
assert.Empty(t, f.runtime.StartJobs())
|
||||
assert.Empty(t, f.rec.startJobs())
|
||||
}
|
||||
|
||||
func TestStartGamePublishFailureSurfacesUnavailable(t *testing.T) {
|
||||
record, now := newReadyGame(t, game.GameTypePublic, "")
|
||||
f := newFixture(t, record, now)
|
||||
f.runtime.SetStartError(errors.New("redis down"))
|
||||
f.rec.startErr = errors.New("redis down")
|
||||
|
||||
_, err := f.service.Handle(context.Background(), startgame.Input{
|
||||
Actor: shared.NewAdminActor(),
|
||||
@@ -191,11 +278,15 @@ func TestStartGamePublishFailureSurfacesUnavailable(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestStartGameRejectsMissingRecord(t *testing.T) {
|
||||
games := gamestub.NewStore()
|
||||
runtime := runtimemanagerstub.NewPublisher()
|
||||
games := gameinmem.NewStore()
|
||||
rec := &runtimeRec{}
|
||||
runtime := newRuntimeMock(t, rec)
|
||||
resolver, err := engineimage.NewResolver(testImageTemplate)
|
||||
require.NoError(t, err)
|
||||
service, err := startgame.NewService(startgame.Dependencies{
|
||||
Games: games,
|
||||
RuntimeManager: runtime,
|
||||
ImageResolver: resolver,
|
||||
Clock: fixedClock(time.Now().UTC()),
|
||||
Logger: silentLogger(),
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user