fix: pass nil leadership ensurer for secrets migrations

manadart · Dec 6, 2024 · 8650812 · 8650812
1 parent 00a7aba
commit 8650812
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/domain/secret/modelmigration/export.go b/domain/secret/modelmigration/export.go
@@ -47,11 +47,10 @@ func (e *exportOperation) Name() string {
 }
 
 func (e *exportOperation) Setup(scope modelmigration.Scope) error {
-	// We must not use a watcher during migration, so it's safe to pass a
-	// nil watcher factory.
 	e.service = service.NewSecretService(
 		state.NewState(scope.ModelDB(), e.logger),
 		secretbackendstate.NewState(scope.ControllerDB(), e.logger),
+		nil,
 		e.logger,
 		service.SecretServiceParams{
 			BackendUserSecretConfigGetter: service.NotImplementedBackendUserSecretConfigGetter,

diff --git a/domain/secret/modelmigration/import.go b/domain/secret/modelmigration/import.go
@@ -72,7 +72,7 @@ func (i *importOperation) Setup(scope modelmigration.Scope) error {
 	backendstate := secretbackendstate.NewState(scope.ControllerDB(), i.logger)
 	i.service = service.NewSecretService(
 		state.NewState(scope.ModelDB(), i.logger),
-		backendstate, i.logger,
+		backendstate, nil, i.logger,
 		service.SecretServiceParams{
 			BackendUserSecretConfigGetter: service.NotImplementedBackendUserSecretConfigGetter,
 		},