refactor(container): move AttachmentConfigProvider to boundaries/out with mockery mock

commit: d64d62f90cd5e0cf0d7d3fce2056bb72a5f0387a
author: brice · 7mo ago · 2026-03-15 16:31 UTC
parent: 6a0be67
signature: unsigned

5 files · +191 -87

M .mockery.yaml +1 -0


@@ -19,6 +19,7 @@ packages:
19	19		SecretProvider:
20	20		EnvLoader:
21	21		ContainerLogWriter:
	22	+	AttachmentConfigProvider:
22	23		TokenStore:
23	24		DomainSecretStore:
24	25		RateLimiter:


@@ -19,6 +19,7 @@ packages:
19	SecretProvider:	19		SecretProvider:
20	EnvLoader:	20		EnvLoader:
21	ContainerLogWriter:	21		ContainerLogWriter:
		22	+	AttachmentConfigProvider:
22	TokenStore:	23		TokenStore:
23	DomainSecretStore:	24		DomainSecretStore:
24	RateLimiter:	25		RateLimiter:

A internal/boundaries/out/attachment_config.go +17 -0

@@ -0,0 +1,17 @@
	1	+	package out
	2	+
	3	+	// AttachmentConfigProvider is a read-only view into the live config service
	4	+	// for attachment and network group resolution. It decouples the container
	5	+	// service from the full ConfigService interface while ensuring fresh reads
	6	+	// at decision time (deploy, restart).
	7	+	//
	8	+	// Implementations must return deep copies of the underlying data so that
	9	+	// callers cannot mutate provider state. Each call must produce an independent
	10	+	// map with independently allocated slices.
	11	+	type AttachmentConfigProvider interface {
	12	+	// GetAttachments returns a deep copy of the current attachment config: domain/group -> []image.
	13	+	GetAttachments() map[string][]string
	14	+
	15	+	// GetNetworkGroups returns a deep copy of the current network group config: group -> []domain.
	16	+	GetNetworkGroups() map[string][]string
	17	+	}

@@ -0,0 +1,17 @@
	1	+	package out
	2	+
	3	+	// AttachmentConfigProvider is a read-only view into the live config service
	4	+	// for attachment and network group resolution. It decouples the container
	5	+	// service from the full ConfigService interface while ensuring fresh reads
	6	+	// at decision time (deploy, restart).
	7	+	//
	8	+	// Implementations must return deep copies of the underlying data so that
	9	+	// callers cannot mutate provider state. Each call must produce an independent
	10	+	// map with independently allocated slices.
	11	+	type AttachmentConfigProvider interface {
	12	+	// GetAttachments returns a deep copy of the current attachment config: domain/group -> []image.
	13	+	GetAttachments() map[string][]string
	14	+
	15	+	// GetNetworkGroups returns a deep copy of the current network group config: group -> []domain.
	16	+	GetNetworkGroups() map[string][]string
	17	+	}

A internal/boundaries/out/mocks/mock_attachment_config_provider.go +128 -0

@@ -0,0 +1,128 @@
	1	+	// Code generated by mockery; DO NOT EDIT.
	2	+	// github.com/vektra/mockery
	3	+	// template: testify
	4	+
	5	+	package mocks
	6	+
	7	+	import (
	8	+	mock "github.com/stretchr/testify/mock"
	9	+	)
	10	+
	11	+	// NewMockAttachmentConfigProvider creates a new instance of MockAttachmentConfigProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
	12	+	// The first argument is typically a *testing.T value.
	13	+	func NewMockAttachmentConfigProvider(t interface {
	14	+	mock.TestingT
	15	+	Cleanup(func())
	16	+	}) *MockAttachmentConfigProvider {
	17	+	mock := &MockAttachmentConfigProvider{}
	18	+	mock.Mock.Test(t)
	19	+
	20	+	t.Cleanup(func() { mock.AssertExpectations(t) })
	21	+
	22	+	return mock
	23	+	}
	24	+
	25	+	// MockAttachmentConfigProvider is an autogenerated mock type for the AttachmentConfigProvider type
	26	+	type MockAttachmentConfigProvider struct {
	27	+	mock.Mock
	28	+	}
	29	+
	30	+	type MockAttachmentConfigProvider_Expecter struct {
	31	+	mock *mock.Mock
	32	+	}
	33	+
	34	+	func (_m MockAttachmentConfigProvider) EXPECT() MockAttachmentConfigProvider_Expecter {
	35	+	return &MockAttachmentConfigProvider_Expecter{mock: &_m.Mock}
	36	+	}
	37	+
	38	+	// GetAttachments provides a mock function for the type MockAttachmentConfigProvider
	39	+	func (_mock *MockAttachmentConfigProvider) GetAttachments() map[string][]string {
	40	+	ret := _mock.Called()
	41	+
	42	+	if len(ret) == 0 {
	43	+	panic("no return value specified for GetAttachments")
	44	+	}
	45	+
	46	+	var r0 map[string][]string
	47	+	if returnFunc, ok := ret.Get(0).(func() map[string][]string); ok {
	48	+	r0 = returnFunc()
	49	+	} else {
	50	+	if ret.Get(0) != nil {
	51	+	r0 = ret.Get(0).(map[string][]string)
	52	+	}
	53	+	}
	54	+	return r0
	55	+	}
	56	+
	57	+	// MockAttachmentConfigProvider_GetAttachments_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAttachments'
	58	+	type MockAttachmentConfigProvider_GetAttachments_Call struct {
	59	+	*mock.Call
	60	+	}
	61	+
	62	+	// GetAttachments is a helper method to define mock.On call
	63	+	func (_e MockAttachmentConfigProvider_Expecter) GetAttachments() MockAttachmentConfigProvider_GetAttachments_Call {
	64	+	return &MockAttachmentConfigProvider_GetAttachments_Call{Call: _e.mock.On("GetAttachments")}
	65	+	}
	66	+
	67	+	func (_c MockAttachmentConfigProvider_GetAttachments_Call) Run(run func()) MockAttachmentConfigProvider_GetAttachments_Call {
	68	+	_c.Call.Run(func(args mock.Arguments) {
	69	+	run()
	70	+	})
	71	+	return _c
	72	+	}
	73	+
	74	+	func (_c MockAttachmentConfigProvider_GetAttachments_Call) Return(stringToStrings map[string][]string) MockAttachmentConfigProvider_GetAttachments_Call {
	75	+	_c.Call.Return(stringToStrings)
	76	+	return _c
	77	+	}
	78	+
	79	+	func (_c MockAttachmentConfigProvider_GetAttachments_Call) RunAndReturn(run func() map[string][]string) MockAttachmentConfigProvider_GetAttachments_Call {
	80	+	_c.Call.Return(run)
	81	+	return _c
	82	+	}
	83	+
	84	+	// GetNetworkGroups provides a mock function for the type MockAttachmentConfigProvider
	85	+	func (_mock *MockAttachmentConfigProvider) GetNetworkGroups() map[string][]string {
	86	+	ret := _mock.Called()
	87	+
	88	+	if len(ret) == 0 {
	89	+	panic("no return value specified for GetNetworkGroups")
	90	+	}
	91	+
	92	+	var r0 map[string][]string
	93	+	if returnFunc, ok := ret.Get(0).(func() map[string][]string); ok {
	94	+	r0 = returnFunc()
	95	+	} else {
	96	+	if ret.Get(0) != nil {
	97	+	r0 = ret.Get(0).(map[string][]string)
	98	+	}
	99	+	}
	100	+	return r0
	101	+	}
	102	+
	103	+	// MockAttachmentConfigProvider_GetNetworkGroups_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetNetworkGroups'
	104	+	type MockAttachmentConfigProvider_GetNetworkGroups_Call struct {
	105	+	*mock.Call
	106	+	}
	107	+
	108	+	// GetNetworkGroups is a helper method to define mock.On call
	109	+	func (_e MockAttachmentConfigProvider_Expecter) GetNetworkGroups() MockAttachmentConfigProvider_GetNetworkGroups_Call {
	110	+	return &MockAttachmentConfigProvider_GetNetworkGroups_Call{Call: _e.mock.On("GetNetworkGroups")}
	111	+	}
	112	+
	113	+	func (_c MockAttachmentConfigProvider_GetNetworkGroups_Call) Run(run func()) MockAttachmentConfigProvider_GetNetworkGroups_Call {
	114	+	_c.Call.Run(func(args mock.Arguments) {
	115	+	run()
	116	+	})
	117	+	return _c
	118	+	}
	119	+
	120	+	func (_c MockAttachmentConfigProvider_GetNetworkGroups_Call) Return(stringToStrings map[string][]string) MockAttachmentConfigProvider_GetNetworkGroups_Call {
	121	+	_c.Call.Return(stringToStrings)
	122	+	return _c
	123	+	}
	124	+
	125	+	func (_c MockAttachmentConfigProvider_GetNetworkGroups_Call) RunAndReturn(run func() map[string][]string) MockAttachmentConfigProvider_GetNetworkGroups_Call {
	126	+	_c.Call.Return(run)
	127	+	return _c
	128	+	}

@@ -0,0 +1,128 @@
	1	+	// Code generated by mockery; DO NOT EDIT.
	2	+	// github.com/vektra/mockery
	3	+	// template: testify
	4	+
	5	+	package mocks
	6	+
	7	+	import (
	8	+	mock "github.com/stretchr/testify/mock"
	9	+	)
	10	+
	11	+	// NewMockAttachmentConfigProvider creates a new instance of MockAttachmentConfigProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
	12	+	// The first argument is typically a *testing.T value.
	13	+	func NewMockAttachmentConfigProvider(t interface {
	14	+	mock.TestingT
	15	+	Cleanup(func())
	16	+	}) *MockAttachmentConfigProvider {
	17	+	mock := &MockAttachmentConfigProvider{}
	18	+	mock.Mock.Test(t)
	19	+
	20	+	t.Cleanup(func() { mock.AssertExpectations(t) })
	21	+
	22	+	return mock
	23	+	}
	24	+
	25	+	// MockAttachmentConfigProvider is an autogenerated mock type for the AttachmentConfigProvider type
	26	+	type MockAttachmentConfigProvider struct {
	27	+	mock.Mock
	28	+	}
	29	+
	30	+	type MockAttachmentConfigProvider_Expecter struct {
	31	+	mock *mock.Mock
	32	+	}
	33	+
	34	+	func (_m MockAttachmentConfigProvider) EXPECT() MockAttachmentConfigProvider_Expecter {
	35	+	return &MockAttachmentConfigProvider_Expecter{mock: &_m.Mock}
	36	+	}
	37	+
	38	+	// GetAttachments provides a mock function for the type MockAttachmentConfigProvider
	39	+	func (_mock *MockAttachmentConfigProvider) GetAttachments() map[string][]string {
	40	+	ret := _mock.Called()
	41	+
	42	+	if len(ret) == 0 {
	43	+	panic("no return value specified for GetAttachments")
	44	+	}
	45	+
	46	+	var r0 map[string][]string
	47	+	if returnFunc, ok := ret.Get(0).(func() map[string][]string); ok {
	48	+	r0 = returnFunc()
	49	+	} else {
	50	+	if ret.Get(0) != nil {
	51	+	r0 = ret.Get(0).(map[string][]string)
	52	+	}
	53	+	}
	54	+	return r0
	55	+	}
	56	+
	57	+	// MockAttachmentConfigProvider_GetAttachments_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAttachments'
	58	+	type MockAttachmentConfigProvider_GetAttachments_Call struct {
	59	+	*mock.Call
	60	+	}
	61	+
	62	+	// GetAttachments is a helper method to define mock.On call
	63	+	func (_e MockAttachmentConfigProvider_Expecter) GetAttachments() MockAttachmentConfigProvider_GetAttachments_Call {
	64	+	return &MockAttachmentConfigProvider_GetAttachments_Call{Call: _e.mock.On("GetAttachments")}
	65	+	}
	66	+
	67	+	func (_c MockAttachmentConfigProvider_GetAttachments_Call) Run(run func()) MockAttachmentConfigProvider_GetAttachments_Call {
	68	+	_c.Call.Run(func(args mock.Arguments) {
	69	+	run()
	70	+	})
	71	+	return _c
	72	+	}
	73	+
	74	+	func (_c MockAttachmentConfigProvider_GetAttachments_Call) Return(stringToStrings map[string][]string) MockAttachmentConfigProvider_GetAttachments_Call {
	75	+	_c.Call.Return(stringToStrings)
	76	+	return _c
	77	+	}
	78	+
	79	+	func (_c MockAttachmentConfigProvider_GetAttachments_Call) RunAndReturn(run func() map[string][]string) MockAttachmentConfigProvider_GetAttachments_Call {
	80	+	_c.Call.Return(run)
	81	+	return _c
	82	+	}
	83	+
	84	+	// GetNetworkGroups provides a mock function for the type MockAttachmentConfigProvider
	85	+	func (_mock *MockAttachmentConfigProvider) GetNetworkGroups() map[string][]string {
	86	+	ret := _mock.Called()
	87	+
	88	+	if len(ret) == 0 {
	89	+	panic("no return value specified for GetNetworkGroups")
	90	+	}
	91	+
	92	+	var r0 map[string][]string
	93	+	if returnFunc, ok := ret.Get(0).(func() map[string][]string); ok {
	94	+	r0 = returnFunc()
	95	+	} else {
	96	+	if ret.Get(0) != nil {
	97	+	r0 = ret.Get(0).(map[string][]string)
	98	+	}
	99	+	}
	100	+	return r0
	101	+	}
	102	+
	103	+	// MockAttachmentConfigProvider_GetNetworkGroups_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetNetworkGroups'
	104	+	type MockAttachmentConfigProvider_GetNetworkGroups_Call struct {
	105	+	*mock.Call
	106	+	}
	107	+
	108	+	// GetNetworkGroups is a helper method to define mock.On call
	109	+	func (_e MockAttachmentConfigProvider_Expecter) GetNetworkGroups() MockAttachmentConfigProvider_GetNetworkGroups_Call {
	110	+	return &MockAttachmentConfigProvider_GetNetworkGroups_Call{Call: _e.mock.On("GetNetworkGroups")}
	111	+	}
	112	+
	113	+	func (_c MockAttachmentConfigProvider_GetNetworkGroups_Call) Run(run func()) MockAttachmentConfigProvider_GetNetworkGroups_Call {
	114	+	_c.Call.Run(func(args mock.Arguments) {
	115	+	run()
	116	+	})
	117	+	return _c
	118	+	}
	119	+
	120	+	func (_c MockAttachmentConfigProvider_GetNetworkGroups_Call) Return(stringToStrings map[string][]string) MockAttachmentConfigProvider_GetNetworkGroups_Call {
	121	+	_c.Call.Return(stringToStrings)
	122	+	return _c
	123	+	}
	124	+
	125	+	func (_c MockAttachmentConfigProvider_GetNetworkGroups_Call) RunAndReturn(run func() map[string][]string) MockAttachmentConfigProvider_GetNetworkGroups_Call {
	126	+	_c.Call.Return(run)
	127	+	return _c
	128	+	}

M internal/usecase/container/config_provider.go +4 -26

@@ -1,29 +1,7 @@
1	1		package container
2	2
3		-	// AttachmentConfigProvider is a read-only view into the live config service
4		-	// for attachment and network group resolution. It decouples the container
5		-	// service from the full ConfigService interface while ensuring fresh reads
6		-	// at decision time (deploy, restart).
7		-	//
8		-	// Implementations must return deep copies of the underlying data so that
9		-	// callers cannot mutate provider state. Each call must produce an independent
10		-	// map with independently allocated slices.
11		-	type AttachmentConfigProvider interface {
12		-	// GetAttachments returns a deep copy of the current attachment config: domain/group → []image.
13		-	GetAttachments() map[string][]string
	3	+	import "github.com/bnema/gordon/internal/boundaries/out"
14	4
15		-	// GetNetworkGroups returns a deep copy of the current network group config: group → []domain.
16		-	GetNetworkGroups() map[string][]string
17		-	}
18		-
19		-	// deepCopyStringMap returns a deep copy of a map[string][]string.
20		-	func deepCopyStringMap(m map[string][]string) map[string][]string {
21		-	if m == nil {
22		-	return nil
23		-	}
24		-	result := make(map[string][]string, len(m))
25		-	for k, v := range m {
26		-	result[k] = append([]string{}, v...)
27		-	}
28		-	return result
29		-	}
	5	+	// AttachmentConfigProvider is an alias for the boundary interface, kept for
	6	+	// internal readability.
	7	+	type AttachmentConfigProvider = out.AttachmentConfigProvider

@@ -1,29 +1,7 @@
1		package container	1		package container
2			2
3	-	// AttachmentConfigProvider is a read-only view into the live config service	3	+	import "github.com/bnema/gordon/internal/boundaries/out"
4	-	// for attachment and network group resolution. It decouples the container
5	-	// service from the full ConfigService interface while ensuring fresh reads
6	-	// at decision time (deploy, restart).
7	-	//
8	-	// Implementations must return deep copies of the underlying data so that
9	-	// callers cannot mutate provider state. Each call must produce an independent
10	-	// map with independently allocated slices.
11	-	type AttachmentConfigProvider interface {
12	-	// GetAttachments returns a deep copy of the current attachment config: domain/group → []image.
13	-	GetAttachments() map[string][]string
14			4
15	-	// GetNetworkGroups returns a deep copy of the current network group config: group → []domain.	5	+	// AttachmentConfigProvider is an alias for the boundary interface, kept for
16	-	GetNetworkGroups() map[string][]string	6	+	// internal readability.
17	-	}	7	+	type AttachmentConfigProvider = out.AttachmentConfigProvider
18	-
19	-	// deepCopyStringMap returns a deep copy of a map[string][]string.
20	-	func deepCopyStringMap(m map[string][]string) map[string][]string {
21	-	if m == nil {
22	-	return nil
23	-	}
24	-	result := make(map[string][]string, len(m))
25	-	for k, v := range m {
26	-	result[k] = append([]string{}, v...)
27	-	}
28	-	return result
29	-	}

M internal/usecase/container/service_test.go +41 -61


@@ -17,24 +17,10 @@ import (
17	17		"go.opentelemetry.io/otel/sdk/metric/metricdata"
18	18
19	19		"github.com/bnema/gordon/internal/adapters/out/telemetry"
20		-	"github.com/bnema/gordon/internal/boundaries/out/mocks"
	20	+	mocks "github.com/bnema/gordon/internal/boundaries/out/mocks"
21	21		"github.com/bnema/gordon/internal/domain"
22	22		)
23	23
24		-	// fakeConfigProvider implements AttachmentConfigProvider for tests.
25		-	type fakeConfigProvider struct {
26		-	attachments map[string][]string
27		-	networkGroups map[string][]string
28		-	}
29		-
30		-	func (f *fakeConfigProvider) GetAttachments() map[string][]string {
31		-	return deepCopyStringMap(f.attachments)
32		-	}
33		-
34		-	func (f *fakeConfigProvider) GetNetworkGroups() map[string][]string {
35		-	return deepCopyStringMap(f.networkGroups)
36		-	}
37		-
38	24		func testContext() context.Context {
39	25		return zerowrap.WithCtx(context.Background(), zerowrap.Default())
40	26		}

@@ -99,10 +85,9 @@ func TestService_NewService_WithConfigProvider(t *testing.T) {
99	85		envLoader := mocks.NewMockEnvLoader(t)
100	86		eventBus := mocks.NewMockEventPublisher(t)
101	87
102		-	provider := &fakeConfigProvider{
103		-	attachments: map[string][]string{"test.com": {"postgres:16"}},
104		-	networkGroups: map[string][]string{"group1": {"test.com"}},
105		-	}
	88	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	89	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.com": {"postgres:16"}}).Maybe()
	90	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{"group1": {"test.com"}}).Maybe()
106	91
107	92		svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
108	93		assert.NotNil(t, svc)

@@ -113,10 +98,10 @@ func TestService_ResolveAttachments_UsesLiveConfigProvider(t *testing.T) {
113	98		envLoader := mocks.NewMockEnvLoader(t)
114	99		eventBus := mocks.NewMockEventPublisher(t)
115	100
116		-	provider := &fakeConfigProvider{
117		-	attachments: map[string][]string{"app.example.com": {"postgres:16"}},
118		-	networkGroups: map[string][]string{},
119		-	}
	101	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	102	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"app.example.com": {"postgres:16"}}).Once()
	103	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
	104	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"app.example.com": {"postgres:16", "redis:7"}}).Once()
120	105
121	106		// Create service with EMPTY static config but a live provider
122	107		svc := NewService(runtime, envLoader, eventBus, nil, Config{

@@ -128,21 +113,18 @@ func TestService_ResolveAttachments_UsesLiveConfigProvider(t *testing.T) {
128	113		result := svc.resolveAttachmentsForDomain("app.example.com")
129	114		assert.Equal(t, []string{"postgres:16"}, result)
130	115
131		-	// Simulate adding a new attachment after construction
132		-	provider.attachments["app.example.com"] = append(provider.attachments["app.example.com"], "redis:7")
133	116		result = svc.resolveAttachmentsForDomain("app.example.com")
134	117		assert.Equal(t, []string{"postgres:16", "redis:7"}, result)
135	118		}
136	119
137	120		func TestService_ResolveAttachments_GroupBasedViaProvider(t *testing.T) {
138		-	provider := &fakeConfigProvider{
139		-	attachments: map[string][]string{
140		-	"shared-group": {"postgres:16"},
141		-	},
142		-	networkGroups: map[string][]string{
143		-	"shared-group": {"app1.example.com", "app2.example.com"},
144		-	},
145		-	}
	121	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	122	+	provider.EXPECT().GetAttachments().Return(map[string][]string{
	123	+	"shared-group": {"postgres:16"},
	124	+	}).Maybe()
	125	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
	126	+	"shared-group": {"app1.example.com", "app2.example.com"},
	127	+	}).Maybe()
146	128
147	129		svc := NewService(
148	130		mocks.NewMockContainerRuntime(t),

@@ -161,12 +143,17 @@ func TestService_ResolveAttachments_GroupBasedViaProvider(t *testing.T) {
161	143		}
162	144
163	145		func TestService_GetNetworkForApp_UsesLiveConfigProvider(t *testing.T) {
164		-	provider := &fakeConfigProvider{
165		-	attachments: map[string][]string{},
166		-	networkGroups: map[string][]string{
167		-	"shared-group": {"app1.example.com", "app2.example.com"},
168		-	},
169		-	}
	146	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	147	+	provider.EXPECT().GetAttachments().Return(map[string][]string{}).Maybe()
	148	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
	149	+	"shared-group": {"app1.example.com", "app2.example.com"},
	150	+	}).Once()
	151	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
	152	+	"shared-group": {"app1.example.com", "app2.example.com", "app3.example.com"},
	153	+	}).Once()
	154	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
	155	+	"shared-group": {"app1.example.com", "app2.example.com", "app3.example.com"},
	156	+	}).Once()
170	157
171	158		svc := NewService(
172	159		mocks.NewMockContainerRuntime(t),

@@ -179,8 +166,6 @@ func TestService_GetNetworkForApp_UsesLiveConfigProvider(t *testing.T) {
179	166		network := svc.getNetworkForApp("app1.example.com")
180	167		assert.Equal(t, "gordon-shared-group", network)
181	168
182		-	// Simulate adding a domain to a group after construction
183		-	provider.networkGroups["shared-group"] = append(provider.networkGroups["shared-group"], "app3.example.com")
184	169		network = svc.getNetworkForApp("app3.example.com")
185	170		assert.Equal(t, "gordon-shared-group", network)
186	171

@@ -1246,10 +1231,9 @@ func TestService_Restart_WithAttachments_ErrorsWhenConfiguredButNotDeployed(t *t
1246	1231		envLoader := mocks.NewMockEnvLoader(t)
1247	1232		eventBus := mocks.NewMockEventPublisher(t)
1248	1233
1249		-	provider := &fakeConfigProvider{
1250		-	attachments: map[string][]string{"test.example.com": {"postgres:16"}},
1251		-	networkGroups: map[string][]string{},
1252		-	}
	1234	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	1235	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16"}}).Maybe()
	1236	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
1253	1237
1254	1238		svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
1255	1239

@@ -1273,10 +1257,9 @@ func TestService_Restart_WithAttachments_ErrorsWhenPartiallyDeployed(t *testing.
1273	1257		envLoader := mocks.NewMockEnvLoader(t)
1274	1258		eventBus := mocks.NewMockEventPublisher(t)
1275	1259
1276		-	provider := &fakeConfigProvider{
1277		-	attachments: map[string][]string{"test.example.com": {"postgres:16", "redis:7"}},
1278		-	networkGroups: map[string][]string{},
1279		-	}
	1260	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	1261	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16", "redis:7"}}).Maybe()
	1262	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
1280	1263
1281	1264		svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
1282	1265

@@ -1302,10 +1285,9 @@ func TestService_Restart_WithAttachments_SucceedsWhenAllDeployed(t *testing.T) {
1302	1285		envLoader := mocks.NewMockEnvLoader(t)
1303	1286		eventBus := mocks.NewMockEventPublisher(t)
1304	1287
1305		-	provider := &fakeConfigProvider{
1306		-	attachments: map[string][]string{"test.example.com": {"postgres:16"}},
1307		-	networkGroups: map[string][]string{},
1308		-	}
	1288	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	1289	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16"}}).Maybe()
	1290	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
1309	1291
1310	1292		svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
1311	1293

@@ -1328,10 +1310,9 @@ func TestService_Restart_WithoutAttachmentFlag_IgnoresMissingAttachments(t *test
1328	1310		envLoader := mocks.NewMockEnvLoader(t)
1329	1311		eventBus := mocks.NewMockEventPublisher(t)
1330	1312
1331		-	provider := &fakeConfigProvider{
1332		-	attachments: map[string][]string{"test.example.com": {"postgres:16"}},
1333		-	networkGroups: map[string][]string{},
1334		-	}
	1313	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	1314	+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16"}}).Maybe()
	1315	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
1335	1316
1336	1317		svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
1337	1318

@@ -1352,10 +1333,9 @@ func TestService_Restart_WithAttachments_NoConfiguredNoDeployed_Succeeds(t *test
1352	1333		envLoader := mocks.NewMockEnvLoader(t)
1353	1334		eventBus := mocks.NewMockEventPublisher(t)
1354	1335
1355		-	provider := &fakeConfigProvider{
1356		-	attachments: map[string][]string{},
1357		-	networkGroups: map[string][]string{},
1358		-	}
	1336	+	provider := mocks.NewMockAttachmentConfigProvider(t)
	1337	+	provider.EXPECT().GetAttachments().Return(map[string][]string{}).Maybe()
	1338	+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
1359	1339
1360	1340		svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
1361	1341

 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"github.com/bnema/gordon/internal/adapters/out/telemetry"
-	"github.com/bnema/gordon/internal/boundaries/out/mocks"
+	mocks "github.com/bnema/gordon/internal/boundaries/out/mocks"
 	"github.com/bnema/gordon/internal/domain"
 )
-// fakeConfigProvider implements AttachmentConfigProvider for tests.
-type fakeConfigProvider struct {
-	attachments   map[string][]string
-	networkGroups map[string][]string
-}
-func (f *fakeConfigProvider) GetAttachments() map[string][]string {
-	return deepCopyStringMap(f.attachments)
-}
-func (f *fakeConfigProvider) GetNetworkGroups() map[string][]string {
-	return deepCopyStringMap(f.networkGroups)
-}
 func testContext() context.Context {
 	return zerowrap.WithCtx(context.Background(), zerowrap.Default())
 }
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{"test.com": {"postgres:16"}},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.com": {"postgres:16"}}).Maybe()
-		networkGroups: map[string][]string{"group1": {"test.com"}},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{"group1": {"test.com"}}).Maybe()
-	}
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
 	assert.NotNil(t, svc)
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{"app.example.com": {"postgres:16"}},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"app.example.com": {"postgres:16"}}).Once()
-		networkGroups: map[string][]string{},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
-	}
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"app.example.com": {"postgres:16", "redis:7"}}).Once()
 	// Create service with EMPTY static config but a live provider
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{
 	result := svc.resolveAttachmentsForDomain("app.example.com")
 	assert.Equal(t, []string{"postgres:16"}, result)
-	// Simulate adding a new attachment after construction
-	provider.attachments["app.example.com"] = append(provider.attachments["app.example.com"], "redis:7")
 	result = svc.resolveAttachmentsForDomain("app.example.com")
 	assert.Equal(t, []string{"postgres:16", "redis:7"}, result)
 }
 func TestService_ResolveAttachments_GroupBasedViaProvider(t *testing.T) {
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments: map[string][]string{
+	provider.EXPECT().GetAttachments().Return(map[string][]string{
-			"shared-group": {"postgres:16"},
+		"shared-group": {"postgres:16"},
-		},
+	}).Maybe()
-		networkGroups: map[string][]string{
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
-			"shared-group": {"app1.example.com", "app2.example.com"},
+		"shared-group": {"app1.example.com", "app2.example.com"},
-		},
+	}).Maybe()
-	}
 	svc := NewService(
 		mocks.NewMockContainerRuntime(t),
 }
 func TestService_GetNetworkForApp_UsesLiveConfigProvider(t *testing.T) {
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments: map[string][]string{},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{}).Maybe()
-		networkGroups: map[string][]string{
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
-			"shared-group": {"app1.example.com", "app2.example.com"},
+		"shared-group": {"app1.example.com", "app2.example.com"},
-		},
+	}).Once()
-	}
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
+		"shared-group": {"app1.example.com", "app2.example.com", "app3.example.com"},
+	}).Once()
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{
+		"shared-group": {"app1.example.com", "app2.example.com", "app3.example.com"},
+	}).Once()
 	svc := NewService(
 		mocks.NewMockContainerRuntime(t),
 	network := svc.getNetworkForApp("app1.example.com")
 	assert.Equal(t, "gordon-shared-group", network)
-	// Simulate adding a domain to a group after construction
-	provider.networkGroups["shared-group"] = append(provider.networkGroups["shared-group"], "app3.example.com")
 	network = svc.getNetworkForApp("app3.example.com")
 	assert.Equal(t, "gordon-shared-group", network)
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{"test.example.com": {"postgres:16"}},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16"}}).Maybe()
-		networkGroups: map[string][]string{},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
-	}
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{"test.example.com": {"postgres:16", "redis:7"}},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16", "redis:7"}}).Maybe()
-		networkGroups: map[string][]string{},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
-	}
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{"test.example.com": {"postgres:16"}},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16"}}).Maybe()
-		networkGroups: map[string][]string{},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
-	}
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{"test.example.com": {"postgres:16"}},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{"test.example.com": {"postgres:16"}}).Maybe()
-		networkGroups: map[string][]string{},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
-	}
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)
 	envLoader := mocks.NewMockEnvLoader(t)
 	eventBus := mocks.NewMockEventPublisher(t)
-	provider := &fakeConfigProvider{
+	provider := mocks.NewMockAttachmentConfigProvider(t)
-		attachments:   map[string][]string{},
+	provider.EXPECT().GetAttachments().Return(map[string][]string{}).Maybe()
-		networkGroups: map[string][]string{},
+	provider.EXPECT().GetNetworkGroups().Return(map[string][]string{}).Maybe()
-	}
 	svc := NewService(runtime, envLoader, eventBus, nil, Config{}, provider)