refactor: split deploy coordination from registry boundary

commit: e150f7b9a7c597f6647e4a2f56ad515c163c7bde
author: brice · 7mo ago · 2026-03-04 13:05 UTC
parent: b89ced4
signature: unsigned

5 files · +140 -9

M internal/adapters/in/cli/controlplane_local.go +13 -3


@@ -18,6 +18,7 @@ type localControlPlane struct {
18	18		containerSvc in.ContainerService
19	19		backupSvc in.BackupService
20	20		registrySvc in.RegistryService
	21	+	deployCoord in.DeployCoordinator
21	22		healthSvc in.HealthService
22	23		logSvc in.LogService
23	24		}

@@ -27,12 +28,21 @@ func NewLocalControlPlane(kernel *app.Kernel) ControlPlane {
27	28		return &localControlPlane{}
28	29		}
29	30
	31	+	registrySvc := kernel.Registry()
	32	+	var deployCoord in.DeployCoordinator
	33	+	if registrySvc != nil {
	34	+	if coordinator, ok := any(registrySvc).(in.DeployCoordinator); ok {
	35	+	deployCoord = coordinator
	36	+	}
	37	+	}
	38	+
30	39		return &localControlPlane{
31	40		configSvc: kernel.Config(),
32	41		secretSvc: kernel.Secrets(),
33	42		containerSvc: kernel.Container(),
34	43		backupSvc: kernel.Backup(),
35		-	registrySvc: kernel.Registry(),
	44	+	registrySvc: registrySvc,
	45	+	deployCoord: deployCoord,
36	46		healthSvc: kernel.Health(),
37	47		logSvc: kernel.Logs(),
38	48		}

@@ -224,8 +234,8 @@ func (l *localControlPlane) Reload(_ context.Context) error {
224	234		}
225	235
226	236		func (l *localControlPlane) DeployIntent(_ context.Context, imageName string) error {
227		-	if l.registrySvc != nil {
228		-	l.registrySvc.SuppressDeployEvent(imageName)
	237	+	if l.deployCoord != nil {
	238	+	l.deployCoord.SuppressDeployEvent(imageName)
229	239		}
230	240		return nil
231	241		}

 	containerSvc in.ContainerService
 	backupSvc    in.BackupService
 	registrySvc  in.RegistryService
+	deployCoord  in.DeployCoordinator
 	healthSvc    in.HealthService
 	logSvc       in.LogService
 }
 		return &localControlPlane{}
 	}
+	registrySvc := kernel.Registry()
+	var deployCoord in.DeployCoordinator
+	if registrySvc != nil {
+		if coordinator, ok := any(registrySvc).(in.DeployCoordinator); ok {
+			deployCoord = coordinator
+		}
+	}
 	return &localControlPlane{
 		configSvc:    kernel.Config(),
 		secretSvc:    kernel.Secrets(),
 		containerSvc: kernel.Container(),
 		backupSvc:    kernel.Backup(),
-		registrySvc:  kernel.Registry(),
+		registrySvc:  registrySvc,
+		deployCoord:  deployCoord,
 		healthSvc:    kernel.Health(),
 		logSvc:       kernel.Logs(),
 	}
 }
 func (l *localControlPlane) DeployIntent(_ context.Context, imageName string) error {
-	if l.registrySvc != nil {
+	if l.deployCoord != nil {
-		l.registrySvc.SuppressDeployEvent(imageName)
+		l.deployCoord.SuppressDeployEvent(imageName)
 	}
 	return nil
 }

M internal/adapters/in/http/admin/handler.go +7 -2


@@ -28,6 +28,11 @@ const maxAdminRequestSize = 1 << 20 // 1MB
28	28		// maxLogLines is the maximum allowed number of log lines that can be requested.
29	29		const maxLogLines = 10000
30	30
	31	+	type registryDeployService interface {
	32	+	in.RegistryService
	33	+	in.DeployCoordinator
	34	+	}
	35	+
31	36		// Handler implements the HTTP handler for the admin API.
32	37		type Handler struct {
33	38		configSvc in.ConfigService

@@ -38,7 +43,7 @@ type Handler struct {
38	43		healthSvc in.HealthService
39	44		secretSvc in.SecretService
40	45		logSvc in.LogService
41		-	registrySvc in.RegistryService
	46	+	registrySvc registryDeployService
42	47		eventBus out.EventPublisher
43	48		log zerowrap.Logger
44	49		}

@@ -130,7 +135,7 @@ func NewHandler(
130	135		healthSvc in.HealthService,
131	136		secretSvc in.SecretService,
132	137		logSvc in.LogService,
133		-	registrySvc in.RegistryService,
	138	+	registrySvc registryDeployService,
134	139		eventBus out.EventPublisher,
135	140		log zerowrap.Logger,
136	141		backupSvc in.BackupService,

 // maxLogLines is the maximum allowed number of log lines that can be requested.
 const maxLogLines = 10000
+type registryDeployService interface {
+	in.RegistryService
+	in.DeployCoordinator
+}
 // Handler implements the HTTP handler for the admin API.
 type Handler struct {
 	configSvc    in.ConfigService
 	healthSvc    in.HealthService
 	secretSvc    in.SecretService
 	logSvc       in.LogService
-	registrySvc  in.RegistryService
+	registrySvc  registryDeployService
 	eventBus     out.EventPublisher
 	log          zerowrap.Logger
 }
 	healthSvc in.HealthService,
 	secretSvc in.SecretService,
 	logSvc in.LogService,
-	registrySvc in.RegistryService,
+	registrySvc registryDeployService,
 	eventBus out.EventPublisher,
 	log zerowrap.Logger,
 	backupSvc in.BackupService,

A internal/boundaries/in/deploy.go +10 -0

@@ -0,0 +1,10 @@
	1	+	package in
	2	+
	3	+	// DeployCoordinator defines deploy coordination operations.
	4	+	//
	5	+	// These methods let the CLI/admin API suppress image-pushed deploy events
	6	+	// while an explicit deploy flow is in progress.
	7	+	type DeployCoordinator interface {
	8	+	SuppressDeployEvent(imageName string)
	9	+	ClearDeployEventSuppression(imageName string)
	10	+	}

@@ -0,0 +1,10 @@
	1	+	package in
	2	+
	3	+	// DeployCoordinator defines deploy coordination operations.
	4	+	//
	5	+	// These methods let the CLI/admin API suppress image-pushed deploy events
	6	+	// while an explicit deploy flow is in progress.
	7	+	type DeployCoordinator interface {
	8	+	SuppressDeployEvent(imageName string)
	9	+	ClearDeployEventSuppression(imageName string)
	10	+	}

A internal/boundaries/in/mocks/mock_deploy_coordinator.go +110 -0

@@ -0,0 +1,110 @@
	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	+	// NewMockDeployCoordinator creates a new instance of MockDeployCoordinator. 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 NewMockDeployCoordinator(t interface {
	14	+	mock.TestingT
	15	+	Cleanup(func())
	16	+	}) *MockDeployCoordinator {
	17	+	mock := &MockDeployCoordinator{}
	18	+	mock.Mock.Test(t)
	19	+
	20	+	t.Cleanup(func() { mock.AssertExpectations(t) })
	21	+
	22	+	return mock
	23	+	}
	24	+
	25	+	// MockDeployCoordinator is an autogenerated mock type for the DeployCoordinator type.
	26	+	type MockDeployCoordinator struct {
	27	+	mock.Mock
	28	+	}
	29	+
	30	+	type MockDeployCoordinator_Expecter struct {
	31	+	mock *mock.Mock
	32	+	}
	33	+
	34	+	func (_m MockDeployCoordinator) EXPECT() MockDeployCoordinator_Expecter {
	35	+	return &MockDeployCoordinator_Expecter{mock: &_m.Mock}
	36	+	}
	37	+
	38	+	// ClearDeployEventSuppression provides a mock function for the type MockDeployCoordinator.
	39	+	func (_mock *MockDeployCoordinator) ClearDeployEventSuppression(imageName string) {
	40	+	_mock.Called(imageName)
	41	+	}
	42	+
	43	+	// MockDeployCoordinator_ClearDeployEventSuppression_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ClearDeployEventSuppression'.
	44	+	type MockDeployCoordinator_ClearDeployEventSuppression_Call struct {
	45	+	*mock.Call
	46	+	}
	47	+
	48	+	// ClearDeployEventSuppression is a helper method to define mock.On call.
	49	+	// - imageName string
	50	+	func (_e MockDeployCoordinator_Expecter) ClearDeployEventSuppression(imageName interface{}) MockDeployCoordinator_ClearDeployEventSuppression_Call {
	51	+	return &MockDeployCoordinator_ClearDeployEventSuppression_Call{Call: _e.mock.On("ClearDeployEventSuppression", imageName)}
	52	+	}
	53	+
	54	+	func (_c MockDeployCoordinator_ClearDeployEventSuppression_Call) Run(run func(imageName string)) MockDeployCoordinator_ClearDeployEventSuppression_Call {
	55	+	_c.Call.Run(func(args mock.Arguments) {
	56	+	var arg0 string
	57	+	if args[0] != nil {
	58	+	arg0 = args[0].(string)
	59	+	}
	60	+	run(arg0)
	61	+	})
	62	+	return _c
	63	+	}
	64	+
	65	+	func (_c MockDeployCoordinator_ClearDeployEventSuppression_Call) Return() MockDeployCoordinator_ClearDeployEventSuppression_Call {
	66	+	_c.Call.Return()
	67	+	return _c
	68	+	}
	69	+
	70	+	func (_c MockDeployCoordinator_ClearDeployEventSuppression_Call) RunAndReturn(run func(imageName string)) MockDeployCoordinator_ClearDeployEventSuppression_Call {
	71	+	_c.Run(run)
	72	+	return _c
	73	+	}
	74	+
	75	+	// SuppressDeployEvent provides a mock function for the type MockDeployCoordinator.
	76	+	func (_mock *MockDeployCoordinator) SuppressDeployEvent(imageName string) {
	77	+	_mock.Called(imageName)
	78	+	}
	79	+
	80	+	// MockDeployCoordinator_SuppressDeployEvent_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SuppressDeployEvent'.
	81	+	type MockDeployCoordinator_SuppressDeployEvent_Call struct {
	82	+	*mock.Call
	83	+	}
	84	+
	85	+	// SuppressDeployEvent is a helper method to define mock.On call.
	86	+	// - imageName string
	87	+	func (_e MockDeployCoordinator_Expecter) SuppressDeployEvent(imageName interface{}) MockDeployCoordinator_SuppressDeployEvent_Call {
	88	+	return &MockDeployCoordinator_SuppressDeployEvent_Call{Call: _e.mock.On("SuppressDeployEvent", imageName)}
	89	+	}
	90	+
	91	+	func (_c MockDeployCoordinator_SuppressDeployEvent_Call) Run(run func(imageName string)) MockDeployCoordinator_SuppressDeployEvent_Call {
	92	+	_c.Call.Run(func(args mock.Arguments) {
	93	+	var arg0 string
	94	+	if args[0] != nil {
	95	+	arg0 = args[0].(string)
	96	+	}
	97	+	run(arg0)
	98	+	})
	99	+	return _c
	100	+	}
	101	+
	102	+	func (_c MockDeployCoordinator_SuppressDeployEvent_Call) Return() MockDeployCoordinator_SuppressDeployEvent_Call {
	103	+	_c.Call.Return()
	104	+	return _c
	105	+	}
	106	+
	107	+	func (_c MockDeployCoordinator_SuppressDeployEvent_Call) RunAndReturn(run func(imageName string)) MockDeployCoordinator_SuppressDeployEvent_Call {
	108	+	_c.Run(run)
	109	+	return _c
	110	+	}

@@ -0,0 +1,110 @@
	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	+	// NewMockDeployCoordinator creates a new instance of MockDeployCoordinator. 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 NewMockDeployCoordinator(t interface {
	14	+	mock.TestingT
	15	+	Cleanup(func())
	16	+	}) *MockDeployCoordinator {
	17	+	mock := &MockDeployCoordinator{}
	18	+	mock.Mock.Test(t)
	19	+
	20	+	t.Cleanup(func() { mock.AssertExpectations(t) })
	21	+
	22	+	return mock
	23	+	}
	24	+
	25	+	// MockDeployCoordinator is an autogenerated mock type for the DeployCoordinator type.
	26	+	type MockDeployCoordinator struct {
	27	+	mock.Mock
	28	+	}
	29	+
	30	+	type MockDeployCoordinator_Expecter struct {
	31	+	mock *mock.Mock
	32	+	}
	33	+
	34	+	func (_m MockDeployCoordinator) EXPECT() MockDeployCoordinator_Expecter {
	35	+	return &MockDeployCoordinator_Expecter{mock: &_m.Mock}
	36	+	}
	37	+
	38	+	// ClearDeployEventSuppression provides a mock function for the type MockDeployCoordinator.
	39	+	func (_mock *MockDeployCoordinator) ClearDeployEventSuppression(imageName string) {
	40	+	_mock.Called(imageName)
	41	+	}
	42	+
	43	+	// MockDeployCoordinator_ClearDeployEventSuppression_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ClearDeployEventSuppression'.
	44	+	type MockDeployCoordinator_ClearDeployEventSuppression_Call struct {
	45	+	*mock.Call
	46	+	}
	47	+
	48	+	// ClearDeployEventSuppression is a helper method to define mock.On call.
	49	+	// - imageName string
	50	+	func (_e MockDeployCoordinator_Expecter) ClearDeployEventSuppression(imageName interface{}) MockDeployCoordinator_ClearDeployEventSuppression_Call {
	51	+	return &MockDeployCoordinator_ClearDeployEventSuppression_Call{Call: _e.mock.On("ClearDeployEventSuppression", imageName)}
	52	+	}
	53	+
	54	+	func (_c MockDeployCoordinator_ClearDeployEventSuppression_Call) Run(run func(imageName string)) MockDeployCoordinator_ClearDeployEventSuppression_Call {
	55	+	_c.Call.Run(func(args mock.Arguments) {
	56	+	var arg0 string
	57	+	if args[0] != nil {
	58	+	arg0 = args[0].(string)
	59	+	}
	60	+	run(arg0)
	61	+	})
	62	+	return _c
	63	+	}
	64	+
	65	+	func (_c MockDeployCoordinator_ClearDeployEventSuppression_Call) Return() MockDeployCoordinator_ClearDeployEventSuppression_Call {
	66	+	_c.Call.Return()
	67	+	return _c
	68	+	}
	69	+
	70	+	func (_c MockDeployCoordinator_ClearDeployEventSuppression_Call) RunAndReturn(run func(imageName string)) MockDeployCoordinator_ClearDeployEventSuppression_Call {
	71	+	_c.Run(run)
	72	+	return _c
	73	+	}
	74	+
	75	+	// SuppressDeployEvent provides a mock function for the type MockDeployCoordinator.
	76	+	func (_mock *MockDeployCoordinator) SuppressDeployEvent(imageName string) {
	77	+	_mock.Called(imageName)
	78	+	}
	79	+
	80	+	// MockDeployCoordinator_SuppressDeployEvent_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SuppressDeployEvent'.
	81	+	type MockDeployCoordinator_SuppressDeployEvent_Call struct {
	82	+	*mock.Call
	83	+	}
	84	+
	85	+	// SuppressDeployEvent is a helper method to define mock.On call.
	86	+	// - imageName string
	87	+	func (_e MockDeployCoordinator_Expecter) SuppressDeployEvent(imageName interface{}) MockDeployCoordinator_SuppressDeployEvent_Call {
	88	+	return &MockDeployCoordinator_SuppressDeployEvent_Call{Call: _e.mock.On("SuppressDeployEvent", imageName)}
	89	+	}
	90	+
	91	+	func (_c MockDeployCoordinator_SuppressDeployEvent_Call) Run(run func(imageName string)) MockDeployCoordinator_SuppressDeployEvent_Call {
	92	+	_c.Call.Run(func(args mock.Arguments) {
	93	+	var arg0 string
	94	+	if args[0] != nil {
	95	+	arg0 = args[0].(string)
	96	+	}
	97	+	run(arg0)
	98	+	})
	99	+	return _c
	100	+	}
	101	+
	102	+	func (_c MockDeployCoordinator_SuppressDeployEvent_Call) Return() MockDeployCoordinator_SuppressDeployEvent_Call {
	103	+	_c.Call.Return()
	104	+	return _c
	105	+	}
	106	+
	107	+	func (_c MockDeployCoordinator_SuppressDeployEvent_Call) RunAndReturn(run func(imageName string)) MockDeployCoordinator_SuppressDeployEvent_Call {
	108	+	_c.Run(run)
	109	+	return _c
	110	+	}

M internal/boundaries/in/registry.go +0 -4


@@ -29,8 +29,4 @@ type RegistryService interface {
29	29		// Tag operations
30	30		ListTags(ctx context.Context, name string) ([]string, error)
31	31		ListRepositories(ctx context.Context) ([]string, error)
32		-
33		-	// Deploy event suppression (prevents double-deploy when CLI manages the push)
34		-	SuppressDeployEvent(imageName string)
35		-	ClearDeployEventSuppression(imageName string)
36	32		}


@@ -29,8 +29,4 @@ type RegistryService interface {
29		// Tag operations	29	// Tag operations
30		ListTags(ctx context.Context, name string) ([]string, error)	30	ListTags(ctx context.Context, name string) ([]string, error)
31		ListRepositories(ctx context.Context) ([]string, error)	31	ListRepositories(ctx context.Context) ([]string, error)
32	-
33	-	// Deploy event suppression (prevents double-deploy when CLI manages the push)
34	-	SuppressDeployEvent(imageName string)
35	-	ClearDeployEventSuppression(imageName string)
36		}	32	}