Add route declarations and automatic port allocation to MCP agent
Service definitions can now declare routes per component instead of manual port mappings: [[components.routes]] name = "rest" port = 8443 mode = "l4" The agent allocates free host ports at deploy time and injects $PORT/$PORT_<NAME> env vars into containers. Backward compatible: components with old-style ports= work unchanged. Changes: - Proto: RouteSpec message, routes + env fields on ComponentSpec - Servicedef: RouteDef parsing and validation from TOML - Registry: component_routes table with host_port tracking - Runtime: Env field on ContainerSpec, -e flag in BuildRunArgs - Agent: PortAllocator (random 10000-60000, availability check), deploy wiring for route→port mapping and env injection Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -237,6 +237,160 @@ func TestCascadeDelete(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestComponentRoutes(t *testing.T) {
|
||||
db := openTestDB(t)
|
||||
if err := CreateService(db, "svc", true); err != nil {
|
||||
t.Fatalf("create service: %v", err)
|
||||
}
|
||||
|
||||
// Create component with routes
|
||||
c := &Component{
|
||||
Name: "api",
|
||||
Service: "svc",
|
||||
Image: "img:v1",
|
||||
Restart: "unless-stopped",
|
||||
DesiredState: "running",
|
||||
ObservedState: "unknown",
|
||||
Routes: []Route{
|
||||
{Name: "rest", Port: 8443, Mode: "l7", Hostname: "api.example.com"},
|
||||
{Name: "grpc", Port: 9443, Mode: "l4"},
|
||||
},
|
||||
}
|
||||
if err := CreateComponent(db, c); err != nil {
|
||||
t.Fatalf("create component: %v", err)
|
||||
}
|
||||
|
||||
// Get and verify routes
|
||||
got, err := GetComponent(db, "svc", "api")
|
||||
if err != nil {
|
||||
t.Fatalf("get: %v", err)
|
||||
}
|
||||
if len(got.Routes) != 2 {
|
||||
t.Fatalf("routes: got %d, want 2", len(got.Routes))
|
||||
}
|
||||
// Routes are ordered by name: grpc, rest
|
||||
if got.Routes[0].Name != "grpc" || got.Routes[0].Port != 9443 || got.Routes[0].Mode != "l4" {
|
||||
t.Fatalf("route[0]: got %+v", got.Routes[0])
|
||||
}
|
||||
if got.Routes[1].Name != "rest" || got.Routes[1].Port != 8443 || got.Routes[1].Mode != "l7" || got.Routes[1].Hostname != "api.example.com" {
|
||||
t.Fatalf("route[1]: got %+v", got.Routes[1])
|
||||
}
|
||||
|
||||
// Update routes via UpdateComponentSpec
|
||||
c.Routes = []Route{{Name: "http", Port: 8080, Mode: "l7"}}
|
||||
if err := UpdateComponentSpec(db, c); err != nil {
|
||||
t.Fatalf("update spec: %v", err)
|
||||
}
|
||||
got, _ = GetComponent(db, "svc", "api")
|
||||
if len(got.Routes) != 1 || got.Routes[0].Name != "http" {
|
||||
t.Fatalf("updated routes: got %+v", got.Routes)
|
||||
}
|
||||
|
||||
// List components includes routes
|
||||
comps, err := ListComponents(db, "svc")
|
||||
if err != nil {
|
||||
t.Fatalf("list: %v", err)
|
||||
}
|
||||
if len(comps) != 1 || len(comps[0].Routes) != 1 {
|
||||
t.Fatalf("list routes: got %d components, %d routes", len(comps), len(comps[0].Routes))
|
||||
}
|
||||
}
|
||||
|
||||
func TestRouteHostPort(t *testing.T) {
|
||||
db := openTestDB(t)
|
||||
if err := CreateService(db, "svc", true); err != nil {
|
||||
t.Fatalf("create service: %v", err)
|
||||
}
|
||||
|
||||
c := &Component{
|
||||
Name: "api",
|
||||
Service: "svc",
|
||||
Image: "img:v1",
|
||||
Restart: "unless-stopped",
|
||||
DesiredState: "running",
|
||||
ObservedState: "unknown",
|
||||
Routes: []Route{
|
||||
{Name: "rest", Port: 8443, Mode: "l7"},
|
||||
{Name: "grpc", Port: 9443, Mode: "l4"},
|
||||
},
|
||||
}
|
||||
if err := CreateComponent(db, c); err != nil {
|
||||
t.Fatalf("create component: %v", err)
|
||||
}
|
||||
|
||||
// Initially host_port is 0
|
||||
ports, err := GetRouteHostPorts(db, "svc", "api")
|
||||
if err != nil {
|
||||
t.Fatalf("get host ports: %v", err)
|
||||
}
|
||||
if ports["rest"] != 0 || ports["grpc"] != 0 {
|
||||
t.Fatalf("initial host ports should be 0: %+v", ports)
|
||||
}
|
||||
|
||||
// Update host ports
|
||||
if err := UpdateRouteHostPort(db, "svc", "api", "rest", 12345); err != nil {
|
||||
t.Fatalf("update rest: %v", err)
|
||||
}
|
||||
if err := UpdateRouteHostPort(db, "svc", "api", "grpc", 12346); err != nil {
|
||||
t.Fatalf("update grpc: %v", err)
|
||||
}
|
||||
|
||||
ports, _ = GetRouteHostPorts(db, "svc", "api")
|
||||
if ports["rest"] != 12345 {
|
||||
t.Fatalf("rest host_port: got %d, want 12345", ports["rest"])
|
||||
}
|
||||
if ports["grpc"] != 12346 {
|
||||
t.Fatalf("grpc host_port: got %d, want 12346", ports["grpc"])
|
||||
}
|
||||
|
||||
// Verify host_port is visible via GetComponent
|
||||
got, _ := GetComponent(db, "svc", "api")
|
||||
for _, r := range got.Routes {
|
||||
if r.Name == "rest" && r.HostPort != 12345 {
|
||||
t.Fatalf("GetComponent rest host_port: got %d", r.HostPort)
|
||||
}
|
||||
if r.Name == "grpc" && r.HostPort != 12346 {
|
||||
t.Fatalf("GetComponent grpc host_port: got %d", r.HostPort)
|
||||
}
|
||||
}
|
||||
|
||||
// Update nonexistent route should fail
|
||||
err = UpdateRouteHostPort(db, "svc", "api", "nonexistent", 99999)
|
||||
if err == nil {
|
||||
t.Fatal("expected error updating nonexistent route")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRouteCascadeDelete(t *testing.T) {
|
||||
db := openTestDB(t)
|
||||
if err := CreateService(db, "svc", true); err != nil {
|
||||
t.Fatalf("create service: %v", err)
|
||||
}
|
||||
|
||||
c := &Component{
|
||||
Name: "api", Service: "svc", Image: "img:v1",
|
||||
Restart: "unless-stopped", DesiredState: "running", ObservedState: "unknown",
|
||||
Routes: []Route{{Name: "rest", Port: 8443, Mode: "l4"}},
|
||||
}
|
||||
if err := CreateComponent(db, c); err != nil {
|
||||
t.Fatalf("create component: %v", err)
|
||||
}
|
||||
|
||||
// Delete service cascades to routes
|
||||
if err := DeleteService(db, "svc"); err != nil {
|
||||
t.Fatalf("delete service: %v", err)
|
||||
}
|
||||
|
||||
// Routes table should be empty
|
||||
ports, err := GetRouteHostPorts(db, "svc", "api")
|
||||
if err != nil {
|
||||
t.Fatalf("get routes after cascade: %v", err)
|
||||
}
|
||||
if len(ports) != 0 {
|
||||
t.Fatalf("routes should be empty after cascade, got %d", len(ports))
|
||||
}
|
||||
}
|
||||
|
||||
func TestEvents(t *testing.T) {
|
||||
db := openTestDB(t)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user