Merge pull request juju#18805 from manadart/dqlite-rename-provider-se…

…rvices

juju#18805

This follows up some prior renamings to make service workers congruent.
- `providerservicefactory` in `internal/worker` is renamed `providerservices` making it congruent with `objectstoreservices`.
- `domainServicesWorker` in that package is renamed `servicesWorker` for the same congruence. It was likely a vestigial copy/paste artefact.

There are no functional changes.

cmd/jujud-controller/agent/machine/manifolds.go

@@ -101,7 +101,7 @@ import (
 	"github.com/juju/juju/internal/worker/objectstoreservices"
 	"github.com/juju/juju/internal/worker/peergrouper"
 	prworker "github.com/juju/juju/internal/worker/presence"
-	"github.com/juju/juju/internal/worker/providerservicefactory"
+	"github.com/juju/juju/internal/worker/providerservices"
 	"github.com/juju/juju/internal/worker/providertracker"
 	"github.com/juju/juju/internal/worker/proxyupdater"
 	psworker "github.com/juju/juju/internal/worker/pubsub"
@@ -716,12 +716,12 @@ func commonManifolds(config ManifoldsConfig) dependency.Manifolds {
 			NewModelDomainServices:      workerdomainservices.NewProviderTrackerModelDomainServices,
 		}),
 
-		providerDomainServicesName: providerservicefactory.Manifold(providerservicefactory.ManifoldConfig{
+		providerDomainServicesName: providerservices.Manifold(providerservices.ManifoldConfig{
 			ChangeStreamName:          changeStreamName,
 			Logger:                    internallogger.GetLogger("juju.worker.providerservicefactory"),
-			NewWorker:                 providerservicefactory.NewWorker,
-			NewProviderServicesGetter: providerservicefactory.NewProviderServicesGetter,
-			NewProviderServices:       providerservicefactory.NewProviderServices,
+			NewWorker:                 providerservices.NewWorker,
+			NewProviderServicesGetter: providerservices.NewProviderServicesGetter,
+			NewProviderServices:       providerservices.NewProviderServices,
 		}),
 
 		queryLoggerName: ifController(querylogger.Manifold(querylogger.ManifoldConfig{

internal/worker/providerservicefactory/manifold.go → internal/worker/providerservices/manifold.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package providerservicefactory
+package providerservices
 
 import (
 	"context"
@@ -104,7 +104,7 @@ func (config ManifoldConfig) output(in worker.Worker, out any) error {
 	if w, ok := in.(*common.CleanupWorker); ok {
 		in = w.Worker
 	}
-	w, ok := in.(*domainServicesWorker)
+	w, ok := in.(*servicesWorker)
 	if !ok {
 		return errors.Errorf("expected input of type dbWorker, got %T", in)
 	}

internal/worker/providerservicefactory/manifold_test.go → internal/worker/providerservices/manifold_test.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package providerservicefactory
+package providerservices
 
 import (
 	"context"

internal/worker/providerservicefactory/package_test.go → internal/worker/providerservices/package_test.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package providerservicefactory
+package providerservices
 
 import (
 	"testing"
@@ -14,8 +14,8 @@ import (
 	loggertesting "github.com/juju/juju/internal/logger/testing"
 )
 
-//go:generate go run go.uber.org/mock/mockgen -typed -package providerservicefactory -destination servicefactory_mock_test.go github.com/juju/juju/internal/services ProviderServices,ProviderServicesGetter
-//go:generate go run go.uber.org/mock/mockgen -typed -package providerservicefactory -destination changestream_mock_test.go github.com/juju/juju/core/changestream WatchableDBGetter
+//go:generate go run go.uber.org/mock/mockgen -typed -package providerservices -destination servicefactory_mock_test.go github.com/juju/juju/internal/services ProviderServices,ProviderServicesGetter
+//go:generate go run go.uber.org/mock/mockgen -typed -package providerservices -destination changestream_mock_test.go github.com/juju/juju/core/changestream WatchableDBGetter
 
 func TestPackage(t *testing.T) {
 	gc.TestingT(t)

internal/worker/providerservicefactory/worker.go → internal/worker/providerservices/worker.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package providerservicefactory
+package providerservices
 
 import (
 	"github.com/juju/errors"
@@ -48,7 +48,7 @@ func NewWorker(config Config) (worker.Worker, error) {
 		return nil, errors.Trace(err)
 	}
 
-	w := &domainServicesWorker{
+	w := &servicesWorker{
 		servicesGetter: config.NewProviderServicesGetter(
 			config.NewProviderServices,
 			config.DBGetter,
@@ -62,27 +62,27 @@ func NewWorker(config Config) (worker.Worker, error) {
 	return w, nil
 }
 
-// domainServicesWorker is a worker that holds a reference to a domain services.
+// servicesWorker is a worker that holds a reference to a domain services.
 // This doesn't actually create them dynamically, it just hands them out
 // when asked.
-type domainServicesWorker struct {
+type servicesWorker struct {
 	tomb tomb.Tomb
 
 	servicesGetter services.ProviderServicesGetter
 }
 
 // ServicesGetter returns the provider domain services getter.
-func (w *domainServicesWorker) ServicesGetter() services.ProviderServicesGetter {
+func (w *servicesWorker) ServicesGetter() services.ProviderServicesGetter {
 	return w.servicesGetter
 }
 
 // Kill kills the domain services worker.
-func (w *domainServicesWorker) Kill() {
+func (w *servicesWorker) Kill() {
 	w.tomb.Kill(nil)
 }
 
 // Wait waits for the domain services worker to stop.
-func (w *domainServicesWorker) Wait() error {
+func (w *servicesWorker) Wait() error {
 	return w.tomb.Wait()
 }
 

internal/worker/providerservicefactory/worker_test.go → internal/worker/providerservices/worker_test.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package providerservicefactory
+package providerservices
 
 import (
 	"github.com/juju/errors"
@@ -64,8 +64,8 @@ func (s *workerSuite) TestWorkerServicesGetter(c *gc.C) {
 	w := s.newWorker(c)
 	defer workertest.CleanKill(c, w)
 
-	srvFact, ok := w.(*domainServicesWorker)
-	c.Assert(ok, jc.IsTrue, gc.Commentf("worker does not implement domainServicesWorker"))
+	srvFact, ok := w.(*servicesWorker)
+	c.Assert(ok, jc.IsTrue, gc.Commentf("worker does not implement servicesWorker"))
 
 	factory := srvFact.ServicesGetter()
 	c.Assert(factory, gc.NotNil)