From f9cfe76a59ca7ce07be07bb47fdf7ab68c9fa931 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Fri, 18 Sep 2026 14:54:25 +0200 Subject: [PATCH] fix(compose): adapt relay/start tests to the container-spec layering Rebasing onto main pulled in the relay work (added after this branch was cut), whose tests build ServiceConfig/PreStart literals against the flat, pre-layering shape: DependsOn/Networks set directly, and PreStart typed as []ServiceHook. Both are incompatible with the ContainerSpec/WorkloadSpec split this branch adopts -- the promoted DependsOn/Networks fields need go1.27 to set via a flat literal (this module stays on 1.26.3), and PreStart is now []PreStartHook, a full container specification, not a plain hook. Signed-off-by: Nicolas De Loof --- pkg/compose/relay_test.go | 16 ++++++++-------- pkg/compose/start_test.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/compose/relay_test.go b/pkg/compose/relay_test.go index 34e84e1b5..7743a64df 100644 --- a/pkg/compose/relay_test.go +++ b/pkg/compose/relay_test.go @@ -110,18 +110,18 @@ func TestRelayNetworks(t *testing.T) { Services: types.Services{ "db": db, "app": { - Name: "app", - DependsOn: types.DependsOnConfig{"db": {}}, - Networks: map[string]*types.ServiceNetworkConfig{"backend": nil}, + Name: "app", + WorkloadSpec: types.WorkloadSpec{DependsOn: types.DependsOnConfig{"db": {}}}, + ContainerSpec: types.ContainerSpec{Networks: map[string]*types.ServiceNetworkConfig{"backend": nil}}, }, "web": { - Name: "web", - DependsOn: types.DependsOnConfig{"db": {}}, - Networks: map[string]*types.ServiceNetworkConfig{"frontend": nil, "backend": nil}, + Name: "web", + WorkloadSpec: types.WorkloadSpec{DependsOn: types.DependsOnConfig{"db": {}}}, + ContainerSpec: types.ContainerSpec{Networks: map[string]*types.ServiceNetworkConfig{"frontend": nil, "backend": nil}}, }, "other": { - Name: "other", - Networks: map[string]*types.ServiceNetworkConfig{"private": nil}, + Name: "other", + ContainerSpec: types.ContainerSpec{Networks: map[string]*types.ServiceNetworkConfig{"private": nil}}, }, }, Networks: types.Networks{"default": {}, "backend": {}, "frontend": {}, "private": {}}, diff --git a/pkg/compose/start_test.go b/pkg/compose/start_test.go index b392112a0..5f9aebd22 100644 --- a/pkg/compose/start_test.go +++ b/pkg/compose/start_test.go @@ -255,7 +255,7 @@ func TestStartService_PreStartSkippedWhenLowestIsRelay(t *testing.T) { project := &types.Project{Name: "prj"} service := types.ServiceConfig{ Name: "db", - PreStart: []types.ServiceHook{{Command: types.ShellCommand{"init"}}}, + PreStart: []types.PreStartHook{{ContainerSpec: types.ContainerSpec{Command: types.ShellCommand{"init"}}}}, } relay := serviceContainer("db", 1, container.StateExited) relay.Labels[api.RelayLabel] = "abc123"